just a few configs
Last  thing I did
added other in commodity list
Merge branch 'master' of https://github.com/RufusMbugua/mnh

Conflicts:
	application/controllers/c_load.php
	application/core/MY_Controller.php
	application/views/survey/v_survey_main.php
Merge branch 'master' of https://github.com/johnotaalo/mnh

Conflicts:
	application/config/database.php
Merge branch 'feature/Data_Retrieval' of https://github.com/rufusmbugua/mnh

Conflicts:
	application/core/MY_Controller.php
	application/models/m_mch_survey.php
	application/views/survey/v_survey_main.php
working on analytics
changes
changes to IMCI follow up tool
Merge branch 'develop' of https://github.com/cheriuyot/mnh into develop

# By cheriuyot
# Via cheriuyot
* 'develop' of https://github.com/cheriuyot/mnh:
  changes

Conflicts:
	application/controllers/c_analytics.php
	application/models/m_analytics.php
Merge branch 'develop' of https://github.com/johnotaalo/mnh into develop

# By CHRISPINE OTAALO
# Via CHRISPINE OTAALO (3) and johnotaalo (2)
* 'develop' of https://github.com/johnotaalo/mnh:
  added other in commodity list
  Last  thing I did
  just a few configs

Conflicts:
	application/core/MY_Controller.php
Added Wgt,Fed and Stn to Indicators