Merge branch 'develop'
Merge branch 'hotfix'
Merge branch 'master' of https://github.com/agentphoenix/bjga-scheduler
Add notes for staff appointments
Adding notes to the calendar files
Merge note changes into develop