Combined all JS into single file
Merge branch 'dev' into gh-pages