fix javascript
Merge branch 'develop'