Merge branch 'm1.mybatis' into m2.entitylifecycle

Conflicts:
	src/main/java/org/javatalks/training/hibernate/mybatisdao/mapper/BookMapper.java