facebook login
Merge branch 'facebook_login'

Conflicts:
	app/models/user.rb