Save the original file name for State forms (and display them)
Merge branch 'keep-form-filename'

Conflicts:
	app/views/shared/_state_upload_form.html.haml