Broken check in, saving work in progress.
Merge branch 'master' into jpa
Work in progress
More query updates
Support for create keys
Merge branch 'master' into jpa
Updates to query and sort builders
Issues 11 and 12, cleanup.
updated scm stuff
Merge branch 'jpa'