以spring side为基准，加入了一些界面控制
Merge branch 'master' of https://github.com/kingliang123/PJWT

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.core.resources.prefs
	.settings/org.eclipse.wst.common.component
	target/classes/applicationContext-shiro.xml
	target/classes/com/devbian/web/controller/HomeController.class
	target/classes/ehcache/ehcache-shiro.xml
	target/m2e-wtp/web-resources/META-INF/maven/com.pera/PJWT/pom.properties
	target/m2e-wtp/web-resources/META-INF/maven/com.pera/PJWT/pom.xml
	target/tmp/jsp/org/apache/jsp/WEB_002dINF/layouts/default_jsp.java
	target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java