- quick auth
Merge branch 'gk-users'

Conflicts:
	app/views/layouts/application.html.haml
	config/routes.rb