Deleted ShopActivity, ShopActivity is changed to ListActivity in line 32 in ItemNotFoundDialogFragment, and activity checkout xml file has the fragment for the buy with google button
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

# By Brandon Fairchild
# Via Brandon Auwaerter (1) and Brandon Fairchild (1)
* 'develop' of https://github.com/ehis/SmartShop:
  Fixed status codes again
  SERVER - fixed status codes.
  SERVER - added assertion error try/catch
  SERVER - added error code.
  SERVER - updated a bunch of shit.