Something for commits
Merge branch 'master' of https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation
Location can be no be put in as a list of cities for another parameter
Fixed some merge problems