This is for issue #481
Merge branch 'desktop' of https://github.com/mozilla/gaia-ui-tests into cost_control_reset
Modified according to zac's suggestion
modified according to suggestion
modified by pep8 standard
modified according to pep8
Cleaning up code
delete conflict file before merging
Merge https://github.com/mozilla/gaia-ui-tests into cost_control_reset
Merging with current head and adding items in manifest of cost control app
Modified according to suggestion
Merge remote-tracking branch 'ypwalter/cost_control_reset'

Conflicts:
	gaiatest/tests/cost_control/manifest.ini