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