Merge pull request #258 from jofomah/fix/stock-count-units

Fix/stock count units
Merge branch 'fix/stock-count-units' into upstream-develop
resolved upstream conflict
changed app-service to use load at home state.