shiro,authrization
authrization,still
pom.properties
Merge branch 'master' of https://github.com/tangside163/springext4

Conflicts:
	src/main/java/com/tangsi/pojo/User.java
	target/classes/com/tangsi/pojo/User.class
	target/m2e-wtp/web-resources/META-INF/maven/sprintext4/sprintext4/pom.properties
	target/m2e-wtp/web-resources/META-INF/maven/sprintext4/sprintext4/pom.xml