change text text size
Merge remote-tracking branch 'origin/master'

Conflicts:
	CheckoutApp/bin/classes/com/example/checkout/CheckoutMainActivity.class