Merge branch 'staging' into 23-codemirror_integration

Conflicts:
	spec/controllers/ontologies_controller_spec.rb
Merge branch '23-codemirror_integration' into develop