Redone our part of the entity model completely. It now makes sense =)
Merge branch 'master' of github.com:markthor/RentIt