Merge branch 'feature-subscription-message'

Conflicts:
themes/bthree-store-quick/bthree-store.css