AM-149: When creating a new Appointment, have better validation to make sure that a Time Slot is overbooked
cleaned up error message that is displayed
AM-151: Add new "CANCELLED_AND_NEED_RESCHEDULE" AppointmentStatus
fixed mistake in merge