Merge branch 'master' of https://github.com/sang4441/ece into greg
Merge branch 'master' into greg
working search with information and date format
Merge branch 'master' of https://github.com/sang4441/ece
Edit Appointment when a doctor. Still need to take care of Update login in service/dao
Merge branch 'greg' of https://github.com/sang4441/ece

Conflicts:
	src/main/java/com/springapp/mvc/dao/AppointmentDAO.java
	src/main/webapp/WEB-INF/pages/doctor/appointment_search.jsp
access rights in patient/staff
Merge branch 'master' of https://github.com/sang4441/ece

Conflicts:
	src/main/java/com/springapp/mvc/controller/StaffController.java
small bug changes