Merge branch 'master' into create-graph-edges

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/repositories/orient_db/user_repository.rb
	app/views/shared/application/_footer.html.erb
	config/initializers/repositories.rb
	config/routes.rb