Merge branch 'master' of https://github.com/wangcb8i8i/CodeGather

Conflicts:
	src/test/java/selftest/Test.java
	src/test/java/selftest/entity/Person.java
	src/test/java/selftest/validrules/rules.fo.xml
Merge branch 'master' of https://github.com/wangcb8i8i/CodeGather

Conflicts:
	WebContent/WEB-INF/log4j.properties
	WinTool.log
	src/test/java/com/wangcb8i8i/codegather/module/controller/UserController.java
	src/test/java/selftest/Test.java