Devise changes
Merge branch 'master' of https://github.com/jassicacanidy/CallistoReinvented

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb