Merge branch 'staging' into develop

Conflicts:
	app/models/ontology.rb
	app/models/repository.rb