item list & merchant status fixes
Merge branch 'checkout1' into develop