Testing on Questions and Indicators
Data Retrieval : Commodities and Equipment
Design Fixes
Merge branch 'hotfix/2.1.0' into develop

Conflicts:
	application/views/pages/v_analytics.php
	application/views/segments/analytics_sidebar_menu.php
Working on Email
statistics on treatments, symptoms and commodities
minor
Merge branch 'hotfix/2.1.0' into develop
Merge branch 'master' of https://github.com/RufusMbugua/mnh into hotfix/2.1.1
changes on hotfix
working commodity
changes
Merge branch 'hotfix/2.1.1' into develop
Updates to IMCI Follow Up Form: Offline
Merge branch 'hotfix/2.1.3'
Merge branch 'hotfix/2.1.3' into develop
Merge branch 'feature/Data_Retrieval' into develop

Conflicts:
	application/core/MY_Controller.php
	js/core.js
style change
Merge branch 'master' of https://github.com/RufusMbugua/mnh into develop
changes on head.php