redirect to ontology edit page when uploading an ontology
add line breaks
fix files controller merge error
use database_cleaner for db-truncation on seed

Also add sensiblity for VERBOSE_SEEDS environment variable.
If the value is 1 the SQL-Statement output is sent to
stdout instead of log/{environment}.log.
add db:migrate:clean task; migrate when server runs.
add category label in ontology edit view
fix equality error.
Merge pull request #513 from ontohub/fast_database_interaction

Fast database interaction.
adjust to new hets version
Merge branch 'staging' into 505-enforce_metadata_input_at_web_upload

Conflicts:
	app/controllers/files_controller.rb
Merge branch 'staging' of github.com:ontohub/ontohub into staging
Adjust to new hets version.
Merge pull request #515 from ontohub/streamline_ontology_edit_view

Add category label in ontology edit view.
Adjust the number of hets processes by the number of cpu cores.
Merge branch 'staging' of github.com:ontohub/ontohub into staging
Logging of exceptions thrown in the resque block.
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 correcting380_suggesting_keywords_faster
run sunspot for unit-tests

OntologySearch test needs sunspot solr.