dev1 modified
Merge https://github.com/chendongtom/gittest

Conflicts:
	test/src/test/Test.java