readd gmail/facebook support
Merge branch 'master' of github.com:raysaagar/signalfire

Conflicts:
	extension/js/contextmenu.js