no message
Merge branch 'master' of https://github.com/JiangTengfei/JShiro

Conflicts:
	.idea/workspace.xml