增加shiro配制
Merge branch 'master' of https://github.com/woodship/luna.git

Conflicts:
	src/main/java/org/woodship/luna/LunaUI.java