Incorporate the latest spring 4 changes
Use the new model generator
Regenerated source code. Only order of the properties changed
Update a bunch of libraries, especially Spring to 4 and add the new
model generator