Merge remote-tracking branch 'origin/release-1-0'
run off production profile
bypass security for superadmins
bypass security for superadmins
exclude superadmins from security - fix
temporarily remove unit security
allow the super admin role to be taken from the rdr_user_mapping rather than just be hard coded
Merge fixes for radar super users and removal of unit security

Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	patientview-parent/patientview/src/main/java/org/patientview/security/impl/UnitVoter.java