october calendar default
Merge branch 'dev'