Uploader clean

This merges in the new JavaScript UI into the current dev branch

Please not that there are still some errors while running the upload process, but we are merging it in order to get the code into dev. I will fix the client UI and the server side code once its in dev