Story 1 to merge conflicts
Merge branch 'master' of https://github.com/dipen2512/Scheduler

Conflicts:
	SchedulerWeb/src/main/java/com/scheduler/mappers/AppointmentMapper.java
	SchedulerWeb/src/main/java/com/scheduler/services/AppointmentService.java
	SchedulerWeb/src/main/webapp/WEB-INF/classes/mappers/AppointmentMapper.xml
	SchedulerWeb/src/main/webapp/WEB-INF/spring/db-context.xml
Merge branch 'origin/master'

Conflicts:
	SchedulerWeb/src/main/java/com/scheduler/services/AppointmentService.java