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
Xfail video tests due to 'load videos' overlay not clearing after pushing resources to SDCard
Merge pull request #895 from zacc/xfail_vid_tests

Xfail video tests due to 'load videos' overlay not clearing after pushin...
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'
The connection unit tests initially require us to be offline so marking appropriately
Adding scrollIntoView workaround for element in browser content
Scroll select option into view before selecting it
Scroll language section and option into to view before interacting with them
Scroll phone lock section into view and wait after setting the passcode
Scroll keyboard section into view before interacting with it
Make the Facebook iframe locator more forgiving to support m.facebook.com in addition to touch.facebook.com
Wait for the first search tip to be displayed before interacting with it