Merge branches 'develop' and 'feature/add-new-radar-patients' of https://github.com/robworth/patientview into feature/add-new-radar-patients

Conflicts:
	patientview-parent/patientview/src/main/java/org/patientview/service/impl/PatientManagerImpl.java