fixes to file upload + minor changes in templates
forgot to add file to previous commit
Merge remote-tracking branch 'udi/master'
fixes for sprint #1