Merge branch 'develop'
Updates Javascript with place holder for global files