Merge branch 'staging' into augmenting249_display_symbols_as_dag

Conflicts:
	app/assets/javascripts/categories.js
	app/assets/stylesheets/ontology.css.sass
	app/models/ontology/entities.rb
	app/views/categories/index.html.haml
	app/views/ontologies/_states.html.haml
	app/views/ontologies/index_ontology.html.haml
Cosmetics.
A little more cosmetics.
Merge branch 'staging' into augmenting249_display_symbols_as_dag
fixing that only real subclassof sentences will be used
add cycle checker To EEdges
Merge branch 'augmenting249_display_symbols_as_dag' of github:ontohub/ontohub into augmenting249_display_symbols_as_dag

Conflicts:
	app/models/ontology/entities.rb
Merge branch 'augmenting249_display_symbols_as_dag' into develop

Conflicts:
	app/assets/javascripts/categories.js
	app/views/categories/index.html.haml
	app/views/ontologies/_states.html.haml