Merge branch 'master' of https://github.com/manastungare/google-calendar-crx

Conflicts:
	src/feeds.js
Merge branch 'master' of https://github.com/manastungare/google-calendar-crx

Conflicts:
	src/feeds.js