Merge branch 'feature/automation' of github.com:openeyes/OpenEyes into feature/automation
Feature files and context should be placed in the right folders
Merge branch 'develop' into feature/automation
Merge branch 'feature/automation' of github.com:openeyes/OpenEyes into feature/automation

Conflicts:
	features/NewASA.feature
	features/NewCorrespondence.feature
	features/NewExaminationWIP.feature
	features/NewOperationBooking.feature
	features/PatientDiagnosisScreen.feature
	features/Phasing.feature
	features/Prescription.feature
	features/bootstrap/FeatureContext.php
	features/bootstrap/Features/Templates/ASA.feature
	features/bootstrap/Features/Templates/Correspondence.feature
	features/bootstrap/Features/Templates/ExaminationWIP.feature
	features/bootstrap/Features/Templates/OperationBooking.feature
	features/bootstrap/Features/Templates/PatientDiagnosisScreen.feature
	features/bootstrap/Features/Templates/Phasing.feature
	features/bootstrap/Features/Templates/Prescription.feature
	features/bootstrap/OpenEyesOpenEyesPageObjects.php
	features/bootstrap/steve/NewASA.feature
	features/bootstrap/steve/NewCorrespondence.feature
	features/bootstrap/steve/NewExaminationWIP.feature
	features/bootstrap/steve/NewOperationBooking.feature
	features/bootstrap/steve/PatientDiagnosisScreen.feature
	features/bootstrap/steve/Phasing.feature
	features/bootstrap/steve/Prescription.feature
Merge branch 'feature/automation' of github.com:openeyes/OpenEyes into feature/automation

Conflicts:
	features/bootstrap/FeatureContext.php
	features/bootstrap/Pages/AddingNewEvent.php
	features/bootstrap/Pages/AnaestheticAudit.php
	features/bootstrap/Pages/Examination.php
	features/bootstrap/Pages/Laser.php
	features/bootstrap/Pages/OperationBooking.php
Ongoing refactoring and merging
Ongoign refactoring and merging
Ongoing refactoring and merging
Merge branch 'feature/automation-steve' into feature/automation

Conflicts:
	features/bootstrap/FeatureContext.php
Ongoing refactoring and merging
Merge pull request #18 from MarcoDeBortoli/feature/automation

Feature/automation