update _message_sending_locato locator
Run stop b2g and start b2g with 'adb root' privs
Removed xfail test_marketplace_search_and_install_app.py
Set user-selected timezone in setUp to override the nitz setting
Update test_calendar_today_date with simplified date
Merge pull request #1112 from bebef1987/fix_sms_app

update _message_sending_locato locator
Merge pull request #1114 from zacc/stop_b2g_as_root

Run stop b2g with 'adb root' privs
Bug 874822 - Allow gaiatest to recover from B2G crashes
fix failing change user region test
Merge pull request #1117 from zacc/mas_cal_date_tz

Set user-selected timezone in setUp to override the nitz setting
Merge pull request #1125 from jonallengriffin/restartfix

Bug 874822 - Allow gaiatest to recover from B2G crashes
Merge pull request #1126 from vaidik/fix_failing_change_user_test

fix failing change user region test
fix marketplace
Add launch_timeout override to the GaiaApps launch method and upgrade Marketplace dev to use a 120second launch timeout
add test to change anonymous user's region
Merge pull request #1107 from vaidik/change_anon_user_region

add test to change anonymous user's region
Merge pull request #1129 from zacc/mk_extra_timeout

Marketplace Dev extra launch timeout
test receive email on active sync #91

Conflicts:
	gaiatest/tests/email/manifest.ini
Merge pull request #1024 from vaidik/master_receive_email_active_sync

test receive email on active sync #91
increase marketplace launch timeout for all environmentts
Merge pull request #1127 from bebef1987/marketplace

fix marketplace