Made music a submodule
Merge branch 'dev'

Conflicts:
	CMakeLists.txt