Merge branch 'staging' into augmenting228_domain_field_properties

Conflicts:
	app/controllers/categories_controller.rb
	app/models/ontology.rb
	app/views/ontologies/edit.html.haml
split accessibles to many lines
Merge branch 'augmenting228_domain_field_properties' into develop

Conflicts:
	app/models/ontology.rb