prepped calendar managerfor manager changes.
Added a line in the Appointment constructor
Merge branch 'master' of https://github.com/trosne/progU48
Completed calendarmanager XML stuff
manual merge, weird line endings
Merge branch 'master' of https://github.com/trosne/progU48