some changes
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch

Conflicts:
	application/config/database.php
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch
generate facility details
Changes
Merge branch 'develop' into mnch

Conflicts:
	application/modules/analytics/controllers/analytics.php
	application/modules/survey/controllers/survey.php
	application/modules/survey/models/m_complete_survey.php
	assets/javascripts/survey.js
Added IMCI Shell
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
Fixed Reporting Progress and LogOut
Fixed Login
Most changes
Merge branch 'mnch' of https://github.com/johnotaalo/essential into mnch

Conflicts:
	application/modules/survey/controllers/form_handler.php