Small updates
Merge branch 'master' of https://github.com/priteshgupta/scrolr

Conflicts:
	extension/manifest.json
Local changes
Merge branch 'master' of https://github.com/priteshgupta/scrolr

Conflicts:
	extension/background.js