xfail test_add_photo_to_contact due to bug 848660
Update bug number for xfail
Merge pull request #496 from bobsilverberg/xfail_photo_to_contact

xfail test_add_photo_to_contact due to bug 848660
Merge remote-tracking branch 'mozilla/master' into issue_467

Conflicts:
	gaiatest/tests/contacts/manifest.ini