Merge branch 'master' of https://github.com/gumartinm/SpringWebServicesForFun

Conflicts:
	cxf/web-services-spring-cxf-client/src/main/resources/log4j2.xml
	jaxb2/web-services-spring-jaxb2-client/src/main/resources/log4j2.xml

diff --cc jaxb2/web-services-spring-jaxb2-client/src/main/resources/log4j2.xml
index 5bbca37,bcb7346..1bf2492
--- 1/jaxb2/web-services-spring-jaxb2-client/src/main/resources/log4j2.xml
--- 2/jaxb2/web-services-spring-jaxb2-client/src/main/resources/log4j2.xml
+++ b/jaxb2/web-services-spring-jaxb2-client/src/main/resources/log4j2.xml
@@@ -58,4 -58,4 +58,4 @@@
              <AppenderRef ref="STDOUT"/>
          </Root>
      </Loggers>
--</Configuration>
++</Configuration>