merged master'
Added in features for JSON, XML, and CSV
Added info to queries.jsp
Merge https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation
Added a testing class that as of now does not work but also does not break also created a preliminary xml of the data
Merge branch 'master' of https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation