Tests
Merge branch 'Anton'

Conflicts:
	src/main/resources/locators.properties