Rearranged the way some of the js files are loaded
Merge remote-tracking branch 'origin/master'