Merge remote-tracking branch 'origin/master' into Evgenii
Merge remote-tracking branch 'origin/Evgenii' into Evgenii
Merge remote-tracking branch 'origin/master' into Evgenii
refactoring
refactoring
refactoring ManageUsersTest
refactoring ManageHostsTest
refactoring ManageMapTest
Merge remote-tracking branch 'origin/master' into Evgenii
Merge remote-tracking branch 'origin/master' into Evgenii
refactoring
Merge remote-tracking branch 'origin/master' into Evgenii

Conflicts:
	src/main/java/test/performance/ManageRulesTest.java
ManageRulesTest: 3.5.7 test added
Merge remote-tracking branch 'origin/Evgenii'