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
Remove xfail email
Added carrier tag to default manifest file for cost control
Merge pull request #1139 from teodosia/carrier-to-manifest

Added carrier tag to default manifest file for cost control
increase marketplace launch timeout for all environmentts
Merge remote-tracking branch 'upstream/v1-train' into v1-train
add test to change anonymous user's region
Align bluetooth objects with master
Refactor both the everything.me search tests to check just the title and shortcusts listed
Merge pull request #1138 from teodosia/remove-xfail-branch

Remove xfail email
Merge pull request #1141 from zacc/refactor_eme_search_tests

Refactor eme search tests
Chnage the "is_wifi_enabled" property in GaiaData to inspect the mozWifiManager rather than the setting
Both FTU tests: Wait for WiFi to be enabled after loading FTU so that FTU Wifi panel will work first time
Xfailed test_cost_control_reset_wifi.py
Merge pull request #1144 from teodosia/xfail-cc-wifi-reset

Xfail test_cost_control_reset_wifi.py