WINDUP-113: Simplified CriteriaBuilders into unified Query API.
Merge pull request #126 from lincolnthree/WINDUP-113

WINDUP-113: Simplified CriteriaBuilders into unified Query API.