Something for commits
Merge branch 'master' of https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation
Adding chart.jsp to graph our data
fixed merge conflicts
Location can be no be put in as a list of cities for another parameter
Fixed some merge problems
Refactored the code that extracts disease burden into its own class so that it can be more easily readable and not as condensed into one file
Adding defaults into the Disease Burden Query class as static finals
Added table to Queries tab with parameter info
Merge https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation