Cleanup
Merge branch '01' into 02
Cleanup, and updated schema to use Spring 3.1