js and uploader fix
Merge branch 'development'