Add data layer atom method to delete existing SMS
Merge branch 'master' of https://github.com/rwood-moz/gaia-ui-tests into delete_sms
Merge branch 'master' of https://github.com/mozilla/gaia-ui-tests
Delete existing SMS messages in test setup
Merge branch 'master' of https://github.com/rwood-moz/gaia-ui-tests into delete_sms
Merge branch 'improve-contacts' of git://github.com/davehunt/gaia-ui-tests
Merge remote-tracking branch 'upstream/master'
Increase timeouts for everything.me test
Update default timeout to 30 seconds
Allow a greater timeout for remove_all_contacts
Merge pull request #347 from jonallengriffin/remove_contacts

Allow a greater timeout for remove_all_contacts
Merge remote-tracking branch 'upstream/master'
Move music tests into music/ subfolder
Add a test for wifi from settings app
Merge branch 'master' into em
Return to everything.me Social screen at end of everything.me test

remove explicit timeouts that were added earlier
Add test for secured network
Merge branch 'master' into timeouts

Conflicts:
	gaiatest/gaia_test.py
Merge pull request #349 from bobsilverberg/timeouts

Update default timeout to 30 seconds
Move gallery tests into gallery/ folder