Merge branch 'feature/googleCalendar' into develop
Merge branch 'develop' of github.com:virtual-secretary/shirley into develop