fixed formatting
fixed jshint errors
added dependencies for the upload library
Merge remote-tracking branch 'origin'