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

Conflicts:
	MyBatis/MyBatis-Spring/src/main/resources/spring-config.xml

diff --cc MyBatis/MyBatis-Spring/src/main/resources/spring-config.xml
index 27a2ea2,d3ed00f..145d172
--- 1/MyBatis/MyBatis-Spring/src/main/resources/spring-config.xml
--- 2/MyBatis/MyBatis-Spring/src/main/resources/spring-config.xml
+++ b/MyBatis/MyBatis-Spring/src/main/resources/spring-config.xml
@@@ -111,9 -111,8 +111,12 @@@
          <property name="adMapper" ref="adMapper" />
      </bean>
  
 -    
+     <bean id="exampleCustomService" class="de.example.mybatis.spring.service.ExampleCustomService">
+         <property name="adCustomMapper" ref="adCustomMapper" />
+     </bean>
-     
++
 +    <bean id="liquibase" class="liquibase.integration.spring.SpringLiquibase">
 +        <property name="dataSource" ref="dataSource" />
 +        <property name="changeLog" value="classpath:/liquibase/liquibaseChangeLogs.xml" />
 +    </bean>
  </beans>