Minor fixes
Merge branch 'master' of https://github.com/SupSuper/OpenXcom.git into fix_ids_generation

Conflicts:
	src/Savegame/SavedGame.cpp