JUnit Testing for all stories and Excpected Time viewed on View Appointment display.
Merge branch 'origin/master'

Conflicts:
	SchedulerWeb/src/main/webapp/WEB-INF/classes/application.properties
	SchedulerWeb/src/main/webapp/WEB-INF/classes/mappers/AppointmentMapper.xml
	SchedulerWeb/src/main/webapp/WEB-INF/views/client/editofficialuser.jsp