update
Merge branch 'master' of github.com:zhudong/BLSales

Conflicts:
	bin/BLSales.apk
	bin/resources.ap_

no change