Merge branch 'improve-contacts' of git://github.com/davehunt/gaia-ui-tests
Merge remote-tracking branch 'upstream/master'
Refactor device_manager
Increase timeouts for everything.me test
Update default timeout to 30 seconds
Merge pull request #346 from jonallengriffin/dm

Refactor device_manager
Allow a greater timeout for remove_all_contacts
Bug 836510 - Disable test_wallpaper.py for pandas
delete alarm from AlarmsDB using JS
Merge pull request #315 from bebef1987/delete_alarm

Delete alarm after the test is done
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