Re-organized javascript files
Merge branch 'folderupload'