update by zj 81
Merge branch 'master' of https://github.com/wantdo/TestPro.git

Conflicts:
	src/com/TUser.java
update by zj