redirect to ontology edit page when uploading an ontology
Merge branch '505-enforce_metadata_input_at_web_upload' into develop

Conflicts:
	app/controllers/files_controller.rb
	app/models/ontology.rb