Changed the order of javascript files
Merge branch 'develop' into it