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

Conflicts:
	src/test/java/com/SubmitNewVacationTest.java