devise fully configured.
devise fully configured.
Merge remote-tracking branch 'origin/master' into devise

Conflicts:
	app/models/user.rb
	app/views/layouts/application.html.erb
	config/initializers/devise.rb
	config/routes.rb
	db/schema.rb