...
Merge branch 'master' of https://github.com/raphaelquintao/SGAforChrome

Conflicts:
	manifest.json