added setTip()
Merge branch 'devel'

Conflicts:
	HelloWorld/src/TestReset.java