Cleanup
Merge branch '01' into 02
Cleanup, and updated schema to use Spring 3.1
Merge branch '02' into 03
Merge branch '03' into 04
Merge branch '04' into 05
Merge branch '05' into 06

Conflicts:
	src/it/resources/spring/beans-datasource-it.xml