Refactor device_manager
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
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
wip
Merge branch 'master' into wifi
Add test for a secure wifi network