working on other totals
Merge branch 'mnch' of https://github.com/cheriuyot/essential into mnch

Conflicts:
	application/modules/analytics/models/analytics_model.php
	application/modules/survey/controllers/survey.php