Regression tests finished for levels 1-3 of RBAC @rbac
+ [OE-4130] ensure child elements get their sided ness from parent element, not siblings
[OE-4151] - fixed saving of users without roles
Merge branch 'release/1.6' of github.com:openeyes/OpenEyes into release/1.6
[OE-4142] - fixed creating users without roles
+ [OE4154] fix permission check for add new events popup
Merge branch 'release/1.6' of github.com:openeyes/OpenEyes into release/1.6
disabled rbac level 3 printing test due to OE-4153 to get jenkins behat working again
Regression tests finished for level 4 of RBAC @rbac
[OE-4158] Fixed saving multiple elements of the same type (for example, an opnote may have multiple Element_OphTrOperationnote_GenericProcedure elements as part of the procedure list)
Merge branch 'release/1.6' of github.com:openeyes/OpenEyes into release/1.6
updated prescription tests in line with mandatory eye options for standard sets
repeat Prescription tests added. Prescription regression tests now 100%
Merge branch 'release/1.6' of https://github.com/openeyes/OpenEyes into release/1.6
Merge branch 'release/1.6' into develop

Conflicts:
	protected/controllers/AdminController.php