#Willy* and Emmy's work
Merge branch 'mnch' of https://github.com/WillyMareka/essential into mnch

Conflicts:
	application/core/MY_Model.php
	application/modules/analytics/controllers/analytics.php
	application/modules/analytics/models/analytics_model.php
	application/modules/survey/controllers/form_handler.php
	application/modules/survey/controllers/generate.php
	application/modules/survey/controllers/survey.php
	application/modules/survey/models/m_complete_survey.php
	application/modules/template/views/mnh/analytics/content_visual_charts_commodity_availability.php
	application/modules/template/views/mnh/pages/v_login.php
	assets/javascripts/analytics.js
	assets/javascripts/survey.js