partial commit from localB1
Merge branch 'localB1'

Conflicts:
	TestProject/src/com/test/proj/Hello.java