git commit special
Merge branch 'master' of https://github.com/heavensay/project-java

Conflicts:
	motley/src/main/java/com/myhexin/shiro/UserRealm.java