...
Merge branch 'master' of https://github.com/RocketsTeam/EvozonPortal.git

Conflicts:
	resources/loginData.csv
	src/test/java/com/requirements/Application.java
	target/classes/com/pages/NewVacationRequest.class