Moving dependencies to Spring 4 and Hibernate 4
Merge remote-tracking branch 'origin/Barebones' into David-Jones