fixed xss bug
Merge branch 'feature/security' into develop

Conflicts:
	views/default/view_Element_OphTrConsent_Other.php
[OE-4309] Fix printing
Merge branch 'release/1.7' into release/orbis-r2