devise
Merge branch 'master' of https://github.com/npxquynh/jouvea

Conflicts:
	Gemfile.lock
	app/models/user.rb
	app/views/layouts/application.html.erb
	db/schema.rb