updates
merging
Merge branch 'master' of https://github.com/rasp23/UFSAutoTests.git

Conflicts:
	UFSAutoTests/src/ru/ufsonline/eticket/tests/TestBase.java
	UFSAutoTests/test-data/uimap.properties