completing merge
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
Remove switch_to_frame
TestEverythingMeInstallApp fix issue#67
Addressed issue #355
Re-enabled SIM imports
Merge remote-tracking branch 'mozilla/master' into add_app
add self.is_element_displayed
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
Merge remote-tracking branch 'mozilla/master' into add_app
test_gallery_full_screen_image_flicks