154 - Small amends to Radar

Fixed the Radar about consent forms, label and unit dropdown in
demographics tab.
Merge remote-tracking branch 'robworth/develop' into features/154-Small-Amends-To-Radar

Conflicts:
	patientview-parent/patientview/src/main/java/org/patientview/patientview/dataout/DataOutThread.java
154 - Small amends to Radar

Updated the column name/type and page label for user who ticked the consent form box.
Merge remote-tracking branch 'robworth/develop' into features/154-Small-Amends-To-Radar
87 - PV - More detailed unit staff list

So then we need to show the "email verified" status (tick/cross) in the
user edit page and have the "Send email verification button" up by the
email. See my attachment.
Merge pull request #109 from lu-yang/features/87-Unit-Staff-List

87 - PV - More detailed unit staff list
revert kevins commit to restrict the units shown
Merge remote-tracking branch 'origin/develop' into develop
Merge pull request #97 from richardli5945/features/154-Small-Amends-To-Radar

154 - Small amends to Radar
Merge remote-tracking branch 'robworth/develop' into features/124-DB-Specialty-Setup

Conflicts:
	patientview-parent/common/src/main/resources/sql/features/25/25.sql