Merge branches 'develop' and 'feature/add-new-radar-patients' of https:/...

.../github.com/robworth/patientview into feature/add-new-radar-patients

Conflicts:
	patientview-parent/radar/src/main/java/org/patientview/radar/service/impl/UserManagerImpl.java