mail
Merge branch 'master' of
https://github.com/TheSpanishTeam/FirstProject.git

Conflicts:
	src/main/java/com/FirstProject/pages/ActionButtonPage.java
	src/main/java/com/FirstProject/pages/EvoCancelVacationPage.java
	src/main/java/com/FirstProject/pages/MyCompletedVacationRequestPage.java
	src/main/java/com/FirstProject/pages/RequestPage.java
	src/main/java/com/FirstProject/pages/SubmitNewVacationPage.java
	src/test/java/com/FirstProject/AproveVacationRequestTest.java
	src/test/java/com/FirstProject/CancelAssigntoTest.java
	src/test/java/com/FirstProject/CancelVacationHistoryVacationTest.java
	src/test/java/com/FirstProject/MailCheck.java
	src/test/java/com/FirstProject/MailCheck2.java
	src/test/java/com/FirstProject/MailCheckAprovedRequestTest.java
	src/test/java/com/FirstProject/MailCheckSubmitedRequestTest.java
	src/test/java/com/FirstProject/MultipleTypesOfVacationsTest.java
	src/test/java/com/FirstProject/MyAprovedVacationsRequestsTest.java
	src/test/java/com/FirstProject/RejectVacationRequestTest.java
	src/test/java/com/FirstProject/RequestConcediuFaraPlata.java
	src/test/java/com/FirstProject/RequestConcediuFaraPlataNecompletat.java
	src/test/java/com/FirstProject/RequestConcediuMedical.java
	src/test/java/com/FirstProject/RequestConcediuSpecial.java
	src/test/java/com/FirstProject/SubmitNewVacationA.java
	src/test/java/com/FirstProject/SummaryClickAdmin.java
	src/test/java/com/FirstProject/ViewAllVacationsTest.java
	src/test/java/com/FirstProject/ViewConcediuByDateTest.java
	src/test/java/com/FirstProject/ViewConcediuByTypeAndDate.java
	src/test/java/com/FirstProject/ViewConcediuDeOdihnaTest.java
	src/test/java/com/FirstProject/ViewConcediuFaraPlataTest.java
	src/test/java/com/FirstProject/ViewConcediuMedicalTest.java
	src/test/java/com/FirstProject/ViewConcediuSpecialTest.java
	src/test/java/com/FirstProject/steps/EvoCancelVacationSteps.java
	src/test/java/com/FirstProject/steps/SubmitNewVacationSteps.java