Merge branch 'deploy_keys'
Dmitriy Zaporozhets authored
Conflicts:
	app/views/layouts/project.html.haml
	db/schema.rb
cbd78922