Fixed merging bugs
Merge
Modified ScheduleView
Merge
Appointment form
Merged interface