test
Merge branch 'master' of https://github.com/ARMA-UNIF/Okkupation_Altis.Altis

Conflicts:
	scripts/waffenbox.sqf