fixing delivery reason
Merge branch 'mnch' of https://github.com/WillyMareka/essential into mnch
fixed mnh resources
Merge branch 'mnch' of https://github.com/cheriuyot/essential into mnch

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