'users'
Merge branch 'master' into login

Conflicts:
	config/routes.rb
Merge branch 'login'