Merge pull request #835 from narfbg/develop-js

Improve the Javascript & Jquery libs