zxzx
Merge branch 'master' of https://github.com/newlifewj/projects.git

Conflicts:
	WebDemo/src/com/webdemo/www/m1/domain/AppUser.java
hgghg