Upload working under root/Upload/
Merge hub/upload

Conflicts:
	src/main/webapp/WEB-INF/classes/index.properties
	src/main/webapp/WEB-INF/classes/index_nl_NL.properties
Merge hub/upload

Conflicts:
	src/main/webapp/WEB-INF/classes/index.properties
	src/main/webapp/WEB-INF/classes/index_nl_NL.properties