Merge remote-tracking branch 'supsuperorgin/master' into OpenXcomExtended

Conflicts:
	src/Ruleset/RuleItem.cpp
	src/Ruleset/RuleItem.h