Added the ability to customize additional page elements on the file upload step
Merge branch 'vireo_undergrad_sprint1_b01995_file_upload_text' into vireo_undergrad_sprint1

Conflicts:
	conf/defaults.properties