Update manifest
Merge branch 'dev' of https://github.com/phasenkasper/Showmator into dev

Conflicts:
	Chrome Extension/manifest.json
update .gitignore
Merge branch 'dev' of https://github.com/phasenkasper/Showmator into dev

Conflicts:
	.gitignore