Conflicts:
	pom.xml
	src/main/java/org/genesys2/spring/config/ApplicationConfig.java
	src/main/java/org/genesys2/spring/config/SpringAclConfig.java
	src/main/java/org/genesys2/spring/config/SpringCacheConfig.java
	src/main/java/org/genesys2/spring/config/SpringCommonConfig.java
	src/main/java/org/genesys2/spring/config/SpringDataBaseConfig.java
	src/main/java/org/genesys2/spring/config/SpringMailConfig.java
	src/main/java/org/genesys2/spring/config/SpringSchedulerConfig.java
	src/main/java/org/genesys2/spring/config/SpringSecurityOauthConfig.java
	src/main/java/org/genesys2/spring/config/SpringServletConfig.java
	src/main/webapp/WEB-INF/web.xml