Merged js into 1 file, removed unused files
Merge branch 'dev'