Multiple fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	CheckoutApp/bin/classes/com/example/checkout/AdminAct$3.class
	CheckoutApp/bin/classes/com/example/checkout/AdminAct$4.class
	CheckoutApp/bin/classes/com/example/checkout/AdminAct.class
	CheckoutApp/bin/classes/com/example/checkout/CheckoutMainActivity.class