adjust cycle-check migration to be valid

it is now possible to rollback the migration.
Merge pull request #519 from ontohub/503-fix_cycle_check

Adjust cycle-check migration to be valid. Fixes #503.
Merge branch 'staging' into 441-import_single_ontologies_with_imports_correctly

Conflicts:
	app/models/ontology.rb
Merge pull request #514 from ontohub/441-import_single_ontologies_with_imports_correctly

Import single ontologies with imports correctly, fixes #441.
Merge branch 'staging' into correcting380_suggesting_keywords_faster
remove merge-remnants.
run sunspot for unit-tests

OntologySearch test needs sunspot solr.
Use Tims fix for starting sunspot:solr in test environment for now.
Merge pull request #467 from ontohub/correcting380_suggesting_keywords_faster

Deactivate auto-completion for now. Related to #380.
state_updated_at added
Merge branch 'staging' into develop

Conflicts:
	app/models/ontology.rb
	app/models/repository.rb
Merge branch 'develop' into develop.ontohub.org