Cleaning Appointment classes. Mostly getters and setters.
Attempting to resolve merge issues
Merge branch 'master' of https://github.com/skkroh/refactor