Patch getAllMediaFiles and remove media in cleanUp to accomodate API changes as per bug 858416
Add a Persona/123done test to check B2G retains Persona cookies
Refactor persona_mock_object to allow different env variables
Merge pull request #823 from zacc/persona_cookie_test

Add a Persona/123done test to check B2G retains Persona cookies
Setup email account using IMAP
Merge pull request #812 from bebef1987/IMAP_email

Setup email account using IMAP
Merge pull request #815 from zacc/update_remove_media

Patch getAllMediaFiles and remove media in cleanUp to accomodate API cha...
Merge remote-tracking branch 'upstream/master' into buy_app
Fix for MK login on v1.0.1
Bolster e.me startup waits test_everythingme_app_install and test_everythingme
Xfailed test_camera_capture_video.py Bug 874026
Merge pull request #834 from teodosia/xfail-capture-video

Xfailed test_camera_capture_video.py
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 remote-tracking branch 'upstream/master' into buy_app