Merge remote-tracking branch 'origin/master' into Roman

Conflicts:
	src/main/java/core/pages/ManageMapPage.java
	src/main/java/core/pages/MonitorMapPage.java
	src/main/java/test/performance/MapTest.java
	src/main/resources/locators.properties
refactoring
Merge remote-tracking branch 'origin/Roman' into Roman

Conflicts:
	src/main/java/core/pages/ManageMapPage.java
	src/main/java/core/pages/MonitorMapPage.java
	src/main/resources/locators.properties
Merge remote-tracking branch 'origin/master' into Roman