Commented out certain fields in the android manifest.  Checkout Activity is replaced instead of shopping cart list.  The code is in line 233 in ShopActivity and used as a way to test out the google wallet API.
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

# By ngoctung4him
# Via ngoctung4him
* 'develop' of https://github.com/ehis/SmartShop:
  fix minor bug