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

Conflicts:
	views/default/view_Element_OphTrConsent_Other.php