test_setup_active_sync_email
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
Change the mp4 video file being used for the test
Unxfail videoplayer tests which are passing on v1.0.1
Revert Xfail for test_play_ogg_video.py
Refactor and reset the time in the setUp of the calendar test
Merge pull request #855 from zacc/revise_calendar_setup

Refactor and reset the time in the setUp of the calendar test
move homescreen test to separate folder
Merge pull request #858 from bebef1987/home_screen

move homescreen test to separate folder
Squashed commit of the following:

William Hsu test_settings_change_keyboard.py
Merge remote-tracking branch 'upstream/master'
Migrate video app object to element.tap() method
Convert marionette.tap(el) to el.tap() for browser app
Xfail test that is failing on tap()
Fix one outstanding tap
Migrate clock app from marionette.tap to el.tap
Migrate Persona app object to el.tap()

Conflicts:

	gaiatest/apps/persona/regions/login.py
migrate fmapp to el.tap()