fix build.xml
test1
master test 4
master test 5
hide HSOFT stick
Merge master into develop

Conflicts:
	build.xml