Edit and Delete Event tests started (Consent Form, ASA)
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop

Conflicts:
	features/bootstrap/Pages/Examination.php