Re-enabled music
fix mem leak in test
unfinished merge
Merge commit 'f50a732f3d092484757e7c6b2f5148e409d1567d' into paulsapps_sound

Conflicts:
	QGearsMain/CMakeLists.txt
finished merge