restructuring and adding new payments tests

Conflicts:
	gaiatest/apps/bango/app.py
	gaiatest/tests/marketplace/test_marketplace_purchase_app_wifi.py