Music in levels played again.
Improved mod support
Merge branch 'master' into v171

Conflicts:
	src/engine/keen/galaxy/common/CMapLoaderGalaxy.cpp