Update default timeout to 30 seconds
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
Merge pull request #353 from zacc/mv_gallery_tests

Move gallery tests
Merge remote-tracking branch 'upstream/master' into mv_music_tests

Conflicts:
	gaiatest/tests/manifest.ini