Merging from ali/oauth_controller and resolving conflicts with master
Merge branch 'oauth2_provider' of github.com:sachinsudheendra/gocd into oauth2_provider

Conflicts:
	server/webapp/WEB-INF/rails.new/config/routes.rb