Commodity, Equipment, Resources, Supplies
Merge branch 'develop' of https://github.com/WillyMareka/mnh into develop

# By Willy Mareka
# Via Willy Mareka
* 'develop' of https://github.com/WillyMareka/mnh:
  Commodity, Equipment, Resources, Supplies

Conflicts:
	application/controllers/c_analytics.php