Version bumps
Use Spring 3.2 XSDs
Reformat code