fix js for file uploader
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/webapp/jsp/templates/base-template.jsp
	src/main/webapp/resources/css/style.css