Merge remote-tracking branch 'origin/augmenting054_displaying_ontology_consistency_status' into develop

Conflicts:
	Gemfile.lock
	app/models/ontology.rb
	app/views/logics/show.html.haml
	app/views/ontologies/_info.html.haml
Merge remote-tracking branch 'origin/augmenting112_ontology_link_graph' into develop

Conflicts:
	Gemfile.lock
	app/views/ontologies/_info.html.haml
	app/views/shared/_ontology.html.haml
	config/routes.rb
Merge remote-tracking branch 'origin/augmenting177_exporting_logic_graph' into develop
Merge remote-tracking branch 'origin/augmenting210_display_distributed_ontologies' into develop

Conflicts:
	app/views/logics/show.html.haml
Merge remote-tracking branch 'origin/correcting194_remove_language_from_views' into develop
Merge remote-tracking branch 'origin/issue17-simple_links' into develop

Conflicts:
	app/helpers/navigation_helper.rb
	app/views/shared/_navigation.html.haml
	config/routes.rb