.
Merge branch 'master' of https://github.com/ManuelPop/training.git

Conflicts:
	VacationTesting/src/test/java/com/steps/VerifyEmailSteps.java