Updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/locators.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/locators.properties
Merge branch 'master' of C:\Infotex with conflicts.
Merge branch 'master' of C:\Infotex with conflicts.