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