0609-2302
Merge branch 'master' of https://github.com/javachn/xclapp.git

Conflicts:
	src/main/java/org/sin/common/security/UserDaoImpl.java
哎呀 不容易
git stash
git pull
git commit -a
a