Conflicts:
	microserviceB_Solution/src/main/java/io/scmspain/tech2014/server/simple/annotation/SimpleRoutingApp.java
	microserviceB_Solution/src/main/resources/eureka-client.properties