Spring domain model
Merge branch 'master' of https://github.com/cyberwillis/2ndFloor-ServicesApp