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

Conflicts:
	UFSAutoTests/config/config.properties