September calendars + October live
commenting out spa stuff
Merge branch 'dev'