Updated xfail reason for calendar fail
Changed wait to one that makes more sense
Un-xfail test_settings_change_language as it looks like it was fixed via https://github.com/mozilla/gaia-ui-tests/commit/a8cb1820cefc62acf943c1dfd7ebb3850d3bf539
Merge pull request #680 from bobsilverberg/unxfail_lang

Un-xfail test_settings_change_language as it looks like it was fixed via...
Fix locator in test_sms_contact
Remove typing in some fields that are causing the test to fail
Merge pull request #681 from bobsilverberg/fix_sms_contact

Fix locator in test_sms_contact
Merge pull request #682 from bobsilverberg/fix_add_new_contact

Remove typing in some fields that are causing the test to fail
Merge pull request #678 from bobsilverberg/music_xfail

Update test_music to fix early failure
Merge branch 'master' into marketplace-obj
Merge branch 'master' of https://github.com/mozilla/gaia-ui-tests.git into marketplace-obj

Conflicts:
	gaiatest/tests/marketplace/test_marketplace_without_connectivity.py
	gaiatest/tests/marketplace/test_search_marketplace_and_install_app.py
Change test_dialer to wait for the call to be in dialing state
Added wait to test_clock_set_alarm_time
Merge pull request #684 from zacc/test_dialer_change_wait_state

Change test_dialer to wait for the call to be in dialing state
Merge pull request #685 from AndreiH/add_wait_clock_set_alarm

Added wait to test_clock_set_alarm_time. Issue #674
Un xfail test_cost_control_reset due to a fix landing
Xfail Bug 862338 - contacts settings Done button not working after activating "Order by last name"
Merge pull request #686 from bobsilverberg/cost_control

Un xfail test_cost_control_reset due to a fix landing
Merge pull request #687 from bebef1987/xfail_contacts

Xfail Bug 862338 -
Bug 862351 - [CONTACTS][DIALER] Adding a contact from dialer results on duplicate contacts
Merge pull request #688 from bebef1987/xfail_cont

Bug 862351 - [CONTACTS][DIALER] Adding a contact from dialer results on ...