strings change
Merge branch 'master' of github.com:taomo117/BumpAndBuyAndroidApp