Merge branch 'dev' of github.com:qatang/cms into qatang-dev
update shiro
Merge branch 'master' of github.com:chirowong/cms

Conflicts:
	pom.xml