Detect Google login
Merge branch 'dev' of https://github.com/Knotable/mailfriend into dev

Conflicts:
	client/accounts.coffee
	client/campaign.coffee
	client/mailfriend.coffee