It is able to sign in with facebook
Merge branch 'feature-facebook'

Conflicts:
	app/models/user.rb