Add a test for enabling and disabling GPS from Settings app
Address nit

Add a wait_for to address failure
Merge branch 'master' into gps

Conflicts:
	gaiatest/tests/settings/manifest.ini
Remove switch_to_frame
Merge branch 'master' into gps
Merge pull request #366 from bobsilverberg/gps

Add a test for enabling and disabling GPS from Settings app