整合登录
Shiro Freemarker Tags整合
整合首页代码
Merge remote-tracking branch 'origin/master'

Conflicts:
	com.newtouch.lion/com.newtouch.lion-webadmin/src/main/webapp/WEB-INF/view/login.ftl