create hets instance if needed
style changes
fix description-reading for logicgraph-parsing

The characters method can be called multiple times in order to retrieve
the full text (like chunks) so we'll need to concatenate the results.
let description for logicgraph default to nil

This is needed for possible updates of description
on subsequent runs of the logicgraph-parsing.
respect newlines when displaying logic description.
abort ontologies only if they are not ontologies

Basically if hets determines that a file is not an ontology file
(catalogs for example), we'll need to abort the processing. In every
other case we should re-raise the original error.
Merge pull request #1117 from ontohub/1022-hotfix_aborting_of_ontologies

1022 hotfix_aborting_of_ontologies
Merge pull request #1091 from ontohub/1088-fix_logicgraph_parser

1088 fix logicgraph parser
Merge pull request #1097 from ontohub/add_hets_instance_generation_to_deploy

create hets instance if needed
Merge branch 'staging' into develop

Conflicts:
	app/controllers/graphs_controller.rb
	app/controllers/logics_controller.rb
	app/models/logic.rb
	app/models/repository/git_repositories.rb
	config/god/app.rb
	config/god/sidekiq_workers.rb
	config/god/watcher.rb
	db/migrate/20141102192542_update_display_name_for_obo.rb
	lib/capistrano/tasks/deploy.cap
	lib/git_repository.rb
	lib/logicgraph_parser.rb
	lib/tasks/hets.rake
Merge branch 'develop' into develop.ontohub.org

Conflicts:
	app/models/logic.rb