Committing JUnit test for the file upload controller
Merge remote-tracking branch 'origin/master'