More fixes for google cal api.
Merge branch 'develop'