Merge branch 'deploy_keys'

Conflicts:
	app/views/layouts/project.html.haml
	db/schema.rb

config/routes.rb

@@ -53,6 +53,8 @@ Gitlab::Application.routes.draw do
       end
     end
 
+    resources :deploy_keys
+
     resources :refs, :only => [], :path => "/" do 
       collection do 
         get "switch"