Merge:
	hash.properties/fileupload.properties -> development.properties
Deleted
	hash.properties
	fileupload.properties