so many change
general
Merge branch 'newjava3' into NewJava1

Conflicts:
	GitJavaProject/src/com/sone/Test.java