Update test_sms_contact to handle multiple recipient in SMS app
Change all-filter locator in dialer/call log app
Remove delete_calls call in test_call_log_all_calls
Merge pull request #893 from zacc/sms_tests_recipient_locator_change

Update test_sms_contact to handle multiple recipient in SMS app
Another reason is that the locator of sms was wrong, and zac's patch fixed that greatly!
Fixed app for tests/clock/test_clock_switch_clock_type.py
Merge pull request #898 from ypwalter/switch_clock_fix

Fixed app for tests/clock/test_clock_switch_clock_type.py
Merge pull request #894 from zacc/update_call_log_locator

test_call_log_all_calls failure on v1-train
Xfailed calendar new event test
Bug 877611 - Make "Select time" popup, in Calendar app, more test friendly
Merge pull request #899 from AlinT/xfail_877611

Xfailed calendar new event test
Migrate camera tests to use el.tap()

Conflicts:

	gaiatest/tests/camera/manifest.ini
Merge remote-tracking branch 'upstream/master'
Remove test_calculator from repository.
Merge pull request #902 from zacc/rem_test_calc

Remove test_calculator from repository.