Working with google callback
Merge remote-tracking branch 'origin/omniauth' into omniauth

Conflicts:
	app/views/layouts/application.html.erb