Merge branches 'develop' and 'feature/diabetes-all' of https://github.com/PatientView/patientview into feature/diabetes-all

Conflicts:
	patientview-parent/common/src/main/resources/sql/features/29/29.sql
	patientview-parent/patientview/src/conf/struts-config.xml
	patientview-parent/patientview/src/main/java/org/patientview/patientview/logon/UnitAdminAddAction.java