Added the weights query
Merge branch 'master' of https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation

Conflicts:
	omod/src/main/java/org/openmrs/module/dataaggregation/web/controller/DataAggregationManageController.java
merged
adding chart.jsp
Merge branch 'master' of https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation
Fixed some code in DataAggregationServiceImpl that is no longer used
Merge branch 'master' of https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation
Merge branch 'master' of https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation
Changed request back to GET, adding the chart.jsp, and removing old commented-out code
Update README.md
Cleaned up Queries table
Merge https://github.com/MoravianOpenMRS/openmrs-module-dataaggregation
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