Add a wait in test_sms to address intermittent failures
Disabled test_play_youtube_video.py
Removed xfail test_marketplace_search_and_install_app.py
Merge pull request #1118 from teodosia/disable-youtube-video

Disabled test_play_youtube_video.py
Merge pull request #1119 from teodosia/unxfail-searh-install-app

Removed xfail test_marketplace_search_and_install_app.py
update _message_sending_locato locator
Merge remote-tracking branch 'upstream/v1-train' into v1-train
Unxfail test_ftu_skip_tour cell data connecting is working on CI now
Merge pull request #1124 from zacc/test_unxfail_test_ftu_skip_tour

Unxfail test_ftu_skip_tour cell data connecting is working on CI now
Run stop b2g and start b2g with 'adb root' privs
Set user-selected timezone in setUp to override the nitz setting
Update test_calendar_today_date with simplified date
Merge remote-tracking branch 'upstream/v1-train' into v1-train
Bug 874822 - Allow gaiatest to recover from B2G crashes
fix failing change user region test
Add launch_timeout override to the GaiaApps launch method and upgrade Marketplace dev to use a 120second launch timeout
fix marketplace
Xfailed test_call_log_all_calls due to bug 897036
Bug 897036 - Dialer app remains at 10% loading when test_call_log_all_calls is run
https://bugzilla.mozilla.org/show_bug.cgi?id=897036

whatever
Merge pull request #1136 from AlinT/xfail_test_call_log_all_calls

Xfailed test_call_log_all_calls due to bug 897036
migrate TestDialerAddContact to app object

Conflicts:

	gaiatest/tests/dialer/test_dialer_add_contact.py
test receive email on active sync #91

Conflicts:
	gaiatest/tests/email/manifest.ini

Conflicts:

	gaiatest/tests/email/manifest.ini