Merge branch 'develop' of https://github.com/RufusMbugua/mnh into develop
consultation, interview, certi.....Eeeee , Graph za section 4 na 5 za HCW zinawork
Take them before something happens
Merge branch 'develop' of https://github.com/RufusMbugua/mnh into develop

Conflicts:
	application/controllers/c_analytics.php
	application/views/segments/analytics_sidebar_menu.php
no
Graph fixed for resources and hardware
Made some graphs in HCW also. So take this one. Not the one below...
facility level and facility type now wor...they can display but use one space. They cant share.
Merge branch 'develop' of https://github.com/cheriuyot/mnh into develop

Conflicts:
	application/controllers/c_analytics.php
	application/models/m_analytics.php
challenge c_analytics and yes and no c_analytics working
kujaribu tu
location statistics has data but graph haionyeshi hata!!!
Merge branch 'develop' of https://github.com/RufusMbugua/mnh into develop

Conflicts:
	application/controllers/c_analytics.php
	application/models/m_analytics.php
ORT graphs should show but there not. Take at risk
All function that need survey_category have them both in m and c_analytics
Just pushing again
Resources
Merge branch 'develop' of https://github.com/WillyMareka/mnh into develop

# By Willy Mareka
# Via Willy Mareka
* 'develop' of https://github.com/WillyMareka/mnh:
  Just pushing again
  ORT graphs should show but there not. Take at risk
  location statistics has data but graph haionyeshi hata!!!
  kujaribu tu
  facility level and facility type now wor...they can display but use one space. They cant share.
  Made some graphs in HCW also. So take this one. Not the one below...
  no
  consultation, interview, certi.....Eeeee , Graph za section 4 na 5 za HCW zinawork Take them before something happens

Conflicts:
	application/controllers/c_analytics.php
	js/analytics.js
Reverted
Merge branch 'develop' of https://github.com/johnotaalo/mnh into develop

# By johnotaalo
# Via johnotaalo
* 'develop' of https://github.com/johnotaalo/mnh:
  Changes to mch section 2 and section 4
  mnh changes

Conflicts:
	application/core/MY_Controller.php
Source tree told me i have to commit