test_setup_basic_gmail
fix manifest
code review update for test_setup_basic_gmail
Merge remote-tracking branch 'mozilla/master' into email_gmail
update to new wifi settings
fic manifest
Merge remote-tracking branch 'mozilla/master' into email_gmail
Deal with StaleElementException in wait_for_element_displayed (and _not_displayed)
Update wait_for_condition to address StaleElementException
Update tests that use wait_for_condition to avoid StaleElementException
Pep8 fixes
code review update
Replace self.marionette with m where applicable
Merge pull request #644 from bebef1987/email_gmail

test_setup_basic_gmail
Merge pull request #787 from bobsilverberg/staleElement

Deal with StaleElementException in wait_for_element_displayed (and _not_displayed)
Change testvars.json to use a carrier:{} object to contain all information pertaining to the carrier SIM
Merge remote-tracking branch 'upstream/master' into tests_to_carrier_testvars_obj

Conflicts:
	gaiatest/tests/test_sms.py
Merge pull request #792 from zacc/tests_to_carrier_testvars_obj

Change testvars.json to use a carrier:{} object to contain all informati...
Update locators for Marketplace-dev
Disable test_marketplace_search_for_paid_apps
Merge pull request #796 from zacc/update_marketplace_locators

Update locators for Marketplace-dev
update video name property
Fix for wifi test