Merge branch 'staging' into 398-delete_ontology_button

Conflicts:
	app/models/ontology.rb
	spec/models/ontology_spec.rb
fix syntax error in test
Merge branch '398-delete_ontology_button' into 701-delete_repository_error

Conflicts:
	app/views/ontologies/_menu.html.haml
allow ontology deletion if the repository is being deleted
Merge branch '701-delete_repository_error' into develop

Conflicts:
	app/models/ontology.rb
	app/views/ontologies/_menu.html.haml
	spec/models/ontology_spec.rb