Fixes a few js bugs
Merge branch 'master' into develop
Merge branch 'master' into develop