testing for admin statistics
modification for wicegrid
Merge branch 'provider_pravin_karan' into admin_pradeep
modification in generating report
Merge branch 'provider_pravin_karan' into admin_pradeep

Conflicts:
	config/development.sphinx.conf
	db/sphinx/development/consumer_delta.spd
	db/sphinx/development/consumer_delta.spi
	db/sphinx/development/drug_core.spa
	db/sphinx/development/drug_core.spd
	db/sphinx/development/drug_core.sph
	db/sphinx/development/drug_core.spi
	db/sphinx/development/drug_core.spp
	db/sphinx/development/provider_core.spa
	db/sphinx/development/provider_core.spd
	db/sphinx/development/provider_core.spp
	db/sphinx/development/provider_core.sps
	db/sphinx/development/provider_delta.spa
	db/sphinx/development/provider_delta.spd
	db/sphinx/development/provider_delta.sph
	db/sphinx/development/provider_delta.spi
	db/sphinx/development/provider_delta.spp
	log/development.sphinx.pid
pulling admin_pradeep branch
pulling admin_pradeep branch
modifications in generating report done
messages delete functionality is done
Merge branch 'admin_pradeep' of github.com:Bharatupgraded/pillphone into provider_pravin_karan