changed shift calendar
Merge branch 'dev'