Updated to use criteria builder rather than HQL
Added 'join' statements to queries
Merge pull request #1 from wdroste/master

HQL switch to use criteria builder