jsckson mapper depedency
user login
spring security
spring security
mainboard
取消spring security
shiro 配置
jpa + hibernate
user JPA instead of jdbc
package move
role,auth
resove Hibernate Junit Open session view
jpa open session entity
user role
item
extjs homepage
tool bar menu
RBAC
local change
Merge remote-tracking branch 'origin/paris' into paris

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	src/main/resources/shiro-config.xml
	src/main/webapp/WEB-INF/pages/view/mainboard/items.js
	src/main/webapp/WEB-INF/pages/view/mainboard/mainboard.js
	src/main/webapp/WEB-INF/view/homepage.html
	target/m2e-wtp/web-resources/META-INF/maven/com.paris/fast-contacts/pom.properties