Admin updates
Admin updates
Merge branch 'master' of https://github.com/thenhkid/icsciences

Conflicts:
	src/main/java/com/portal/ics/dao/impl/patientDAOImpl.java
	src/main/java/com/portal/ics/dao/patientDAO.java
	src/main/java/com/portal/ics/service/Impl/patientManagerImpl.java
	src/main/java/com/portal/ics/service/patientManager.java