fixed bug in handlers for facebook and google logins
merging with master