Merge branch 'fix_fixed_weapon'

Conflicts:
	src/Battlescape/BattlescapeGenerator.cpp