Added JS libraries for file uploading
Basic uploading functionality, including progress bar
Modified the file upload controller to correctly return the response map
Modified the upload form from the upload view
Merge remote-tracking branch 'origin/master'