Updated to build correct JS file
Merge branch 'develop' into gh-pages