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