Display order info on checkout screen
Merge branch 'master' of https://github.com/kellyk/b3
include categories in search query
Fixing merge conflict