Working on 2.0 update.  Added options page, switched theme to progmatic injection, added event page, added popup page
Merge branch 'master' into test

Conflicts:
	Thumbs.db
	a/Thumbs.db
	manifest.json
	theme.css