'.js' not ' JS'
Merge branch 'development'