Trying to add the seperate query classes again
Merge branch 'master' of https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation