Conflicts:
	src/main/java/org/genesys2/spring/config/ApplicationConfig.java
	src/main/resources/spring/spring.properties