Uncompleted chnages
Merge branch 'mnch' of https://github.com/RufusMbugua/essential into mnch

Conflicts:
	application/modules/survey/models/m_complete_survey.php
Class Edit
some change in supervisor
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch

Conflicts:
	application/core/MY_Model.php
	application/modules/survey/controllers/generate.php
	assets/javascripts/survey.js
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch