Marionette version bump
Merge pull request #930 from AaronMT/0.5.29

Marionette version bump
test for send email with active async
Change _switch_to_keyboard() to switch_to_keyboard()
Update Readme.md
Add the tap targeting hack to fix failure of test_settings_passcode
Remove unused code in the test
Rename a non-pythonic variable
Align some test steps between master and v1.0.1
Remove the check for emails in the Inbox from test_setup_active_sync_email
as that will be covered by a test_send_active_sync_email test
Bumped version number to 0.11
Merge pull request #931 from vaidik/test-send-email-activesync

test for send email with activesync to activesync
Update Readme.md
Seperate the various media types, allowing them to fail/timeout independently. Also opens up the possibility of asserting file counts for each type.
Remove uneccessary second call to get all media
Avoid overriding the script timeout when restarting B2G
Merge branch 'master' of https://github.com/mozilla/gaia-ui-tests into switch_to_keyboard
Solved conflicts: gaiatest/tests/settings/test_settings_passcode.py
Adding back the change of test_settings_passcode.py
Remove delete_bookmark tearDown from test_browser_bookmark and test_everythingme_app
Merge pull request #938 from davehunt/separate-media

Separate calls for media file types
Merge pull request #929 from bebef1987/warning

Update the readme file with email, risks and restart information
Merge pull request #932 from ypwalter/switch_to_keyboard

Change _switch_to_keyboard() to switch_to_keyboard()