added default uom when product count is undefined refs item:618
Merge branch 'develop' into refactor/fix-uom-doses-disappear
removed colon from front of uom ref item:618
Merge pull request #411 from musamusa/refactor/fix-uom-doses-disappear

Refactor/fix uom doses disappear