Merged to 'feature/add-new-radar-patients' to remove duplicate branch
Move merging to 'feature/add-new-radar-patients' to remove duplicate branch
Fix to accommodate different user path on Dev
Merge branch 'develop' of https://github.com/robworth/patientview into feature/add-new-radar-patients

Conflicts:
	patientview-parent/radar/src/main/java/org/patientview/radar/dao/impl/DemographicsDaoImpl.java
	patientview-parent/radar/src/main/java/org/patientview/radar/dao/impl/JoinRequestDaoImpl.java
	patientview-parent/radar/src/main/java/org/patientview/radar/service/impl/UserManagerImpl.java
	patientview-parent/radar/src/main/java/org/patientview/radar/web/pages/patient/AddPatientPage.java
	patientview-parent/radar/src/main/java/org/patientview/radar/web/panels/DemographicsPanel.java
	patientview-parent/radar/src/main/java/org/patientview/radar/web/panels/SelectPatientPanel.java
	patientview-parent/radar/src/main/java/org/patientview/radar/web/panels/generic/GenericDemographicsPanel.java
	patientview-parent/radar/src/test/java/org/patientview/radar/test/roles/unitadmin/RoleHelper.java
	patientview-parent/radar/src/test/java/org/patientview/radar/test/roles/unitadmin/UnitAdminTests.java
Merge pull request #133 from robworth/feature/add-new-radar-patients

Feature/add new radar patients