tset
Merge remote-tracking branch 'origin' into teest
Merge branch 'hanbat'

defaultdoc name is shown now
Past visit results and visit search
Merge branch 'master' of https://github.com/sang4441/ece
Included doctor in getPatient.

Conflicts:
	src/main/java/com/springapp/mvc/controller/PatientController.java
update
update on appointment
dashboard changed
Merge branch 'master' of https://github.com/sang4441/ece

Conflicts:
	.idea/workspace.xml
Appointment search with working date search. Still needs results to return all information
Appointment search with working date search. Still needs results to return all information
Merge branch 'greg' of https://github.com/sang4441/ece
Working Appointment search with date.
Still need to return all information
login
access rights in patient/staff