Merge branch 'develop'
js files