Merge remote-tracking branches 'origin/HEAD', 'origin/master', 'origin/prelive', 'origin/cj-feed' and 'origin/F_precategorize'
Merge branch 'master' of https://github.com/Chatshop/chatshop-web