shop,exchange,mobile commits
conflicts
some bugs fixes
conflicts