Merge pull request #227 from jofomah/refactor/cca

refactor stockout broadcast message, added fallback for mobile
Merge branch 'upstream-develop' into fix/UI-fixes