Nix
Merge branch 'master' of https://github.com/raubwuerger/StrategicGameProject

Conflicts:
	HoIModDesigner/Win32/Debug/HoIModDesigner.exe
	HoIModDesigner/Win32/Debug/HoIModDesigner.ilk
Merge branch 'master' of https://github.com/raubwuerger/StrategicGameProject
Auf ItemTypeBase System umgestellt