Generalized CPA queries
Merge branch 'master' of https://github.com/mbdietrich/NutrOnto