Fix previous commit
Regenerated js files
Merge branch 'master' into gh-pages