small fixes
yup
yyyyyyyup
Ruleset: comment out ExtraMusic
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL

Conflicts:
	src/Battlescape/BattlescapeGenerator.cpp