Merge branch 'hotfix/2.1.1' into develop

Conflicts:
	application/controllers/c_analytics.php
	application/models/m_analytics.php
	application/views/analytics/content_visual_charts_commodity_availability.php
	application/views/pages/v_analytics.php
	application/views/segments/analytics_sidebar_menu.php
commiting
Merge branch 'hotfix/2.1.1' into develop

Conflicts:
	application/views/segments/analytics_sidebar_menu.php
Merge branch 'develop' of https://github.com/RufusMbugua/mnh into develop

Conflicts:
	application/controllers/c_analytics.php
	application/models/m_analytics.php
	application/views/analytics/content_visual_charts_commodity_availability.php
	application/views/segments/analytics_sidebar_menu.php
Graph za nini.......zaaaa.... za hardware na resources zinawork both mnh and ch.
working on analytics
Merge branch 'develop' of https://github.com/RufusMbugua/mnh into develop
analytics
Merge branch 'develop' of https://github.com/WillyMareka/mnh into develop

# By Willy Mareka
# Via Willy Mareka
* 'develop' of https://github.com/WillyMareka/mnh:
  Graph za nini.......zaaaa.... za hardware na resources zinawork both mnh and ch.
  commiting

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

# By cheriuyot
# Via cheriuyot
* 'develop' of https://github.com/cheriuyot/mnh:
  analytics
  working on analytics

Conflicts:
	application/controllers/c_analytics.php
	application/models/m_analytics.php