Merge remote-tracking branch 'origin/release'

Conflicts:
	patientview/src/main/java/com/worthsoln/patientview/XmlImportUtils.java
84 - Tidy help page formatting
Remove dupes, in case users are admins for multiple units
add last login and date of birth to sql
79 - Added click to see message text
87 - Unit staff list - change password column title
88 - patient list - change password title
88 - patient list - add emailverified and accountlocked in DaoImpl
Merge remote-tracking branch 'origin/release' into develop

Conflicts:
	patientview/src/main/java/com/worthsoln/repository/impl/PatientDaoImpl.java
	patientview/src/main/java/com/worthsoln/service/impl/MessageManagerImpl.java
	patientview/src/main/webapp/body/control/unit_users.jsp