common case change to new logic
Merge branch 'master' of https://github.com/Chatshop/chatshop-web
common case fix