version
解决web module问题
spring security test1
spring security
Merge branch 'paris'

Conflicts:
	pom.xml
	src/main/java/demo/controller/DemoController.java
	src/main/resources/spring-config.xml
	src/main/resources/spring-servlet.xml
	src/test/java/demo/controller/LocalTest.java
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	target/m2e-wtp/web-resources/META-INF/maven/com.paris/fast-contacts/pom.properties
	target/m2e-wtp/web-resources/META-INF/maven/com.paris/fast-contacts/pom.xml