[OE-2635] bugfix
Merge branch 'master' of github.com:openeyes/OphTrConsent

Conflicts:
	models/Element_OphTrConsent_Procedure.php