Issue #45: Refactored database queries to use foreignKey__fieldName in
order to reduce database queries.
Merge pull request #46 from rogerskw/iss45

Issue #45: Refactored database queries to use foreignKey__fieldName in