1.0 bugfix
Merge branch 'Branch_ben_1.0bugfix'

Conflicts:
	HelloWorld.java