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

Conflicts:
	target/classes/com/pages/DictionaryPage.class
	target/test-classes/com/LoginCSVTest.class
	target/test-classes/com/requirements/Application.class
	target/test-classes/com/steps/EndUserSteps.class