Merge branch 'master' into develop
fixed variable conflict in javascript
Merge branch 'develop'