Change url of gcalendar
Merge branch 'master' into salesforce

Conflicts:
	config/env/staging.json