This is just to update mine
Fixed the horrible merge conflict of one blank line
merged master'
Added in features for JSON, XML, and CSV
Added info to queries.jsp
Merge https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation