Adding basic implementation for Aggregation.
Merge branch 'master' of https://github.com/imperiumsage/fieldhealer

Conflicts:
	fieldhealer/src/org/indiahackathon/healingfields/server/diagnoser/DiagnoseServiceImpl.java
Merge branch 'master' of https://github.com/imperiumsage/fieldhealer

No idea
Merge branch 'master' of https://github.com/imperiumsage/fieldhealer
Added all code for aggregation service.
Merge branch 'master' of https://github.com/imperiumsage/fieldhealer

Conflicts:
	fieldhealer/.settings/com.google.appengine.eclipse.core.prefs
	fieldhealer/src/org/indiahackathon/healingfields/server/servlets/DiagnoseServlet.java