added color by role to calendar
added store label to calendar
merge calendar changes
Merge branch 'calendar_functions'

* calendar_functions:
  merge calendar changes
  added store label to calendar
  added color by role to calendar