Merging my branch
The code for getting the data from the result string to be able to put into a chart with JFreeChart
Added new Queries link to header and more parameters
fixed merge
 Something for commits
Merge branch 'master' of https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation
Modified .jsp files/fixed link titles
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
Fixed minor controller issue
Changed diseasecounts.form from .GET to .POST