[v1-train]
Trigger video player controls via javascript to be reliable
Compare the time of the video playing by time rather than string
Update test_marketplace_login to use the personatestuser
Merge pull request #833 from teodosia/marketplace-login-personatest

Update test_marketplace_login to use the personatestuser
Merge pull request #836 from zacc/refactor_video_v1-train

[v1-train] Adjust logic in video tests
Use stricter is_displayed waits on the <sections> in gallery app object
Xfail test_marketplace_search_and_install_app Bug 874337 - Searching for an app returns "No results found"
Merge pull request #842 from bebef1987/xfail

Xfail test_marketplace_search_and_install_app Bug 874337 - Searching for...
Merge pull request #843 from zacc/add_gallery_waits

Use stricter is_displayed waits on the <sections> in gallery app object
Change Persona app object wait to wait for loading class to clear
Merge pull request #846 from zacc/new_persona_loading_locator

Change Persona app object wait to wait for loading class to clear
adjust locator name in test_browser_search.py
test_setup_active_sync_email
[v1-train]Fix for test_call_log_all_calls.py
Merge pull request #853 from teodosia/fix-call-log-locator

[v1-train]Fix for test_call_log_all_calls.py
Merge pull request #825 from bebef1987/ActiveSync

test_setup_active_sync_email
test play ogg and mp4
Merge pull request #852 from bebef1987/video_tests

test play ogg and mp4
Xfailed marketplace tests due to bug 875261
Merge pull request #856 from teodosia/xfail-markeplace-name

Xfailed marketplace tests due to bug 875261
Merge remote-tracking branch 'mozilla/master' into send_email2

Conflicts:
	gaiatest/tests/email/manifest.ini