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
user authority and resource mapping