shopping commit
Merge branch 'shopping'