Some merge related changes
Merge branch 'westerland2' of github.com:ishigu/altis into westerland2

Conflicts:
	extDB-Build/Altis_Life.Altis/Functions.h
	extDB-Build/Altis_Life.Altis/core/functions/fn_loadGear.sqf
	extDB-Build/Altis_Life.Altis/core/rebel/fn_rebLoadout.sqf