EvoCancelVacation,MyFreeDaysPage,ControlPanelTest,ControlPanelSteps,EvoCancelStep
Merge branch 'master' of https://github.com/RocketsTeam/EvozonPortal.git

Conflicts:
	src/test/java/com/requirements/Application.java
	target/classes/com/pages/DepartmentPage.class
	target/classes/com/pages/DictionaryPage.class
	target/classes/com/pages/NewVacationRequest.class
	target/classes/com/pages/SubmitVacationRequest.class
	target/test-classes/com/requirements/Application.class
	target/test-classes/com/steps/EndUserSteps.class
Merge branch 'master' of https://github.com/RocketsTeam/EvozonPortal.git

Conflicts:
	src/test/java/com/requirements/Application.java