fixed some issue
added method
Merge remote-tracking branch 'origin/version_1' into john_version_1

Conflicts:
	src/zhen/version1/test/SampleTestClass.java