Unxfail test_add_contact_to_favourites.py
Unxfail test_gallery_edit_photo.py
Merge pull request #1156 from zacc/unxfail_2tests

Unxfail test_gallery_edit_photo, test_contact_add_favorite
Unxfail SIM import tests
Merge pull request #1158 from zacc/unxfail_sim_import

Unxfail SIM import tests
Bump marionette client to 0.5.36, see bug 899731
disable Keyboard FTU
xfail Bug 900905 - Changing mozSettings value of "keyboard.ftu.enabled" has no effect when launching the Keyboard app for the first time
Merge pull request #1161 from bebef1987/key_board

Keyboard FTU View
Put preventative wait into Contacts tests to wait for contacts lists to load especially after API insertions
Put preventative wait for app_update_notification for test_system_notification.py
Merge pull request #1162 from zacc/insert_contact_wait

Put preventative wait into Contacts tests to wait for contacts lists
xfail Bug 877611 - Make "Select time" popup, in Calendar app, more test friendly
Merge pull request #1164 from bebef1987/key_board

xfail Bug 900905 - Changing mozSettings value of "keyboard.ftu.enabled" has no effect when launching the Keyboard app for the first time
Bug 899984 - Everything.Me search results take a long time to show
Merge pull request #1163 from zacc/app_upd_wait

Put preventative wait for app_update_notification
Merge pull request #1165 from bebef1987/xfail_ev.me

Bug 899984 - Everything.Me search results take a long time to show
TBPL disable test_system_notification with Bug 900991
Merge pull request #1166 from zacc/tbpl_xfail_test_notif

TBPL disable test_system_notification with Bug 900991
Bug 901475 - Can't view a full screen image in gallery