Converted to new operation models.
Merge branch 'develop' into feature/stockroom_ui

Conflicts:
	omod/src/main/java/org/openmrs/module/openhmis/inventory/web/ModuleRestConstants.java
	omod/src/main/java/org/openmrs/module/webservices/rest/resource/ItemStockResource.java
	omod/src/main/webapp/resources/js/model/stockRoom.js
Continuing basic stockroom page design.
Merge branch 'develop' into feature/stockroom_ui
Merge branch 'feature/stockroom_ui' into develop
Merge branch 'develop' of github.com:OpenHMIS/openmrs-module-openhmis.inventory into develop