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
Addressed issue #355
Re-enabled SIM imports
Merge remote-tracking branch 'mozilla/master' into issue_355
replaced step to check for 1 import
Merge branch 'master' into gps
Merge remote-tracking branch 'mozilla/master' into issue_355
added assert for the contact in the contact API
dialer app object
code review
Switch back to sys frame in test_call_contact
r=jgriffin in IRC; disabling this test due to bug 840612.

Bug 840612 - Connection to Mozilla Guest wi-fi looks successful, but actually isn't
Disabling due to bug 833764 - target is null after tapping on cards view; r=jgriffin in IRC
Merge pull request #383 from zacc/switch_before_frame_lost

Switch back to sys frame in test_call_contact
Use remote phone number instead of twilio phone number
Restore settings from testvars if present
Wait for apploadtime event when launching apps
Merge remote-tracking branch 'mozilla/master' into issue_355