completing merge
test_MMI Fixes #47
WIP test_youtube
Add a manifest attribute to indicate unit tests. This is useful for demonstrating Gaia UI tests
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
Merge remote-tracking branch 'mozilla/master' into MMI
check testvars IMEI value
Remove switch_to_frame
TestEverythingMeInstallApp fix issue#67
add IMEI value in testvars
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
Addressed issue #355
Re-enabled SIM imports
Merge remote-tracking branch 'jonallengriffin/allcontacts'