modified:   bin/ShopSoftClient.apk
Merge branch 'master' of https://github.com/saketsjo/ShopSoftClient