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

Conflicts:
	gaiatest/tests/manifest.ini
Merge pull request #352 from zacc/mv_music_tests

Move music tests