added setName
Merge branch 'devel'

Conflicts:
	HelloWorld/src/Test.java