Added appointment and time slot models
Merge origin/master