updated inventory rules mock data to suit switch to product type uom.
updated product profile and product types fixture.
Merge branch 'upstream-develop' into fix/replaced-dtp-with-penta-removed-bcg-10

Conflicts:
	app/scripts/services/inventoryrulesfactory.js
Merge pull request #312 from jofomah/fix/replaced-dtp-with-penta-removed-bcg-10

Fix/replaced dtp with penta removed bcg 10