small refactoring
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
Merge branch 'm1.jdbc' into m1.springjdbc.ch1
Merge branch 'm1.springjdbc.ch1' into m1.springjdbc.ch2
Merge branch 'm1.springjdbc.ch2' into m1.mybatis
Merge branch 'm1.mybatis' into m2.properties
Merge branch 'm2.properties' into m2.entitylifecycle
Merge branch 'm2.entitylifecycle' into m2.ids