Second quick gCal update
Merge branch 'feature/googleCalendar' into develop