Trimming done
fixed monthly activities
Correction on trimming
More correction but trimming not so proper for guidelines
Merge branch 'mnch' of https://github.com/cheriuyot/essential into mnch

Conflicts:
	application/modules/analytics/controllers/analytics.php
Merge branch 'mnch' of https://github.com/WillyMareka/essential into mnch

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