Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java
Merge branch 'master' into tymtsiv

Conflicts:
	CSB_ADMIN_UI_tests/.idea/workspace.xml
	CSB_ADMIN_UI_tests/src/main/java/com/test/help/tools/xpathFinder.java
	CSB_ADMIN_UI_tests/src/main/java/com/test/steps/MySteps.java