comit avant de tester le devise_for userS
test users
Merge branch 'master' of https://github.com/facenord-sud/collaide

Conflicts:
	app/controllers/users/omniauth_callbacks_controller.rb
	app/models/user.rb
	app/views/devise/sessions/new.html.haml
	config/initializers/devise.rb