Client side
Merge branch 'master' of github.com:startup-ix/retailer