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