Changes were made to the build.gradle file and the android manifest file.  SmartShop supports the google play api.  ShopActivity checks the version of the play app, and uses toast to inform the user to update google play app.  More changes to come.
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

# By Sean Gibeault (11) and others
# Via Sean Gibeault (6) and others
* 'develop' of https://github.com/ehis/SmartShop: (30 commits)
  --fixed error on singleItemView page
  --added new logic for shopping cart --added toast message when you add the shopping cart --added quantity picker to the shopping cart
  no message
  --Added the Options Drawer to shopping cart and shop activity --welcome activity now goes straight to shop (ListActivity)
  edit some color
  fix some minor bugs
  Modify some color
  fix scanner bug
  --added price to the check out --removed old activities
  fix scanner bug
  change background
  change logo of app
  create verify user activity
  add welcome
  --Fixed everything!
  checkout dialog fragment
  email
  edit shoppinglist XML
  --modified shopping cart
  deleted orig file for AndroidManifest
  ...

Conflicts:
	src/main/AndroidManifest.xml
	src/main/java/com/mobile/smartshop/ShopActivity.java