Added Query Builder

Also changes to some JDOs and CRUDService