Merge branch 'm1.mybatis' into m2.entitylifecycle

Conflicts:
	src/main/java/org/javatalks/training/hibernate/mybatisdao/mapper/BookMapper.java
created m2.properties
added user mapping
added user mapping
changed all files to get conflicts
Merge branch 'm2.properties' into m2.entitylifecycle

Conflicts:
	src/main/java/org/javatalks/training/hibernate/dao/UserDao.java
	src/main/java/org/javatalks/training/hibernate/entity/Book.java
	src/main/resources/org/javatalks/training/hibernate/entity/User.hbm.xml
	src/test/java/org/javatalks/training/hibernate/dao/BookDaoTest.groovy
Merge branch 'm2.properties' into m2.entitylifecycle

Conflicts:
	src/main/java/org/javatalks/training/hibernate/dao/UserDao.java
	src/main/java/org/javatalks/training/hibernate/entity/Book.java
	src/main/resources/org/javatalks/training/hibernate/entity/User.hbm.xml
	src/test/java/org/javatalks/training/hibernate/dao/BookDaoTest.groovy
renamed test
added user mapping
Merge branch 'm2.properties' into m2.entitylifecycle

Conflicts:
	src/main/java/org/javatalks/training/hibernate/entity/User.java
	src/main/resources/org/javatalks/training/hibernate/entity/Book.hbm.xml
test to demo properties of different types
small refactoring
small refactoring
merge
default are xml
Merge branch 'm1.mybatis' into m2.properties
small refactoring
Merge branch 'm2.properties' into m2.entitylifecycle
Merge branch 'm2.entitylifecycle' into m2.ids
added another branch