merged changes from 1.1.2
Merge branch 'master' of https://github.com/gschizas/reddit-companion

Conflicts:
	src/manifest.json
	src/pageOverlay.js
merged changes from 1.1.2