redirect to ontology edit page when uploading an ontology
add line breaks
fix files controller merge error
Merge branch 'staging' into 505-enforce_metadata_input_at_web_upload

Conflicts:
	app/controllers/files_controller.rb
Merge branch 'staging' of github.com:ontohub/ontohub into staging