test_MMI Fixes #47
Add a test for enabling and disabling GPS from Settings app
Add test for enabling cell data via Settings app
Address nit

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

Conflicts:
	gaiatest/tests/settings/manifest.ini
Use SpecialPowers in place of switch_to_frame for getting and setting settings
Merge remote-tracking branch 'mozilla/master' into MMI
check testvars IMEI value
Remove the permission at the end
Remove switch_to_frame
Respond to cell data prompt and xfail due to bug 837664
add IMEI value in testvars
Merge pull request #364 from bobsilverberg/cd

Add test for enabling cell data via Settings app
Merge pull request #368 from bobsilverberg/settings

Use SpecialPowers in place of switch_to_frame for getting and setting settings
Fix getAllContacts when an error occurs
Switch to the system app context when using mobile data or wifi APIs
Merge pull request #351 from bebef1987/MMI

Dialer MMI code tests
Add kill call into test_make_a_call teardown
Merge pull request #373 from davehunt/fix-cell-wifi

Switch to the system app context when using mobile data or wifi APIs
Add kill_active_call and call in teardown of appropriate tests