no message
Revert "no message"

This reverts commit 099f2c43460ac1bdf5c8eb4c15c014724d7ee719.
Merge branch 'master' of https://github.com/ShoppingScout/ShoppingScout
no message
no message
Merge branch 'master' of https://github.com/ShoppingScout/ShoppingScout