sampleDiseases
fixed conflicts
added JSONFormatter and test
Fixed JSONFormatter unit tests
added and tested an XML Formatter
Added a CSV Formatter class and test class
Updated the format
Updated the tests to the new format
Merge branch 'OUTPUT-CSV' of https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation into OUTPUT
now adding
Merge conflict fixed
Merge branch 'OUTPUT-XML' of https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation into OUTPUT
Fixed some generic type warnings
Fixed interface for CSVFormatter
Refactored CSVFormatter, Moved the formatter classes to .api.impl, Changed output from PascalCase to camelCase
Made Controller classuse the new formatters
Integrated new Output formatters with entire project. Changed Interfaces in Query classes and our Service class from String to List<Object>
People need to stop comitting unfinished code to master, its really really old and stupid at this point.