paris branch start
start paris branch

start paris branch
include spring config to web.xml
update configuration
spring mvc
version
maven tomcat7 plugin
pom properties
Merge branch 'paris'

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.paris/fast-contacts/pom.properties