avatar
fix facebook issue
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/users/sessions_controller.rb
	app/models/user.rb
merge
Merge pull request #42 from subicura/master

fix facebook issue