Merge branch 'master' of https://github.com/SupSuper/OpenXcom.git into Polish.lng

Conflicts:
	bin/data/Language/Polish.lng

Conflicts resolved.