+ fix compliant email for diagnosis changes
Merge branch 'release/1.4' of github.com:openeyes/OphCoTherapyapplication into release/1.4

Conflicts:
	views/email/email_compliant.php