Use the new model generator
Update a bunch of libraries, especially Spring to 4 and add the new
model generator