Update Dev
Merge branch 'master' of https://github.com/FlorianGeyer/AltisLifeUCI

Conflicts:
	luci.Altis/ai.sqf

Resolved conflicts with AI