Merge branch 'mnch' into develop
survey
Merge branch 'mnch' of https://github.com/RufusMbugua/essential into mnch

Conflicts:
	assets/javascripts/survey.js
complete survey
some changes
fixed reporting progress
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch

Conflicts:
	application/config/database.php
separated section 3
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch
sections separated
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch
sorted it
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch
sorted section 3
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch
Merged willy's work
Form Posting IMCI
fixing staff trained+nurses in mnh
few edits on tiers
fixed a bug in analytics.js