Init
Merge remote-tracking branch 'origin/github' into dev

Conflicts:
	extension/background.js