Fixed user authentication
Merge branch 'master' into rails4

Conflicts:
	app/models/concerns/users/devise_customization.rb