Correction on admin priviledges in admin list
Merge branch 'origin/cash-137' of github.com:AlexKimani/openmrs-module-openhmis.inventory into AlexKimani-origin/cash-137

Conflicts:
	omod/src/main/java/org/openmrs/module/openhmis/inventory/extension/html/AdminList.java
Merge branch 'AlexKimani-origin/cash-137' into develop