July Calendar + default May update
Merge branch 'dev'