Merge commit '11d070abe6f4876b47a6f28661b334abf84d942a' into armajunkies

Conflicts:
	addons/R3F_ARTY_AND_LOG/R3F_LOG/config.sqf
	addons/scripts/DynamicWeatherEffects.sqf
	briefing.sqf
	client/clientEvents/getInVehicle.sqf
	client/functions/playerActions.sqf
	client/functions/playerSetupGear.sqf
	client/functions/spawnOnBeacon.sqf
	client/init.sqf
	client/systems/adminPanel/optionSelect.sqf
	client/systems/groups/loadGroupManagement.sqf
	client/systems/hud/playerHud.sqf
	client/systems/playerMenu/dialog/respawn_dialog.hpp
	client/systems/vehicleStore/applyVehicleTexture.sqf
	config.sqf
	description.ext
	init.sqf
	mission.sqm
	persistence/client/players/applyPlayerData.sqf
	persistence/client/players/applyPlayerInfo.sqf
	persistence/client/players/savePlayerData.sqf
	persistence/client/players/setupPlayerDB.sqf
	persistence/players/s_loadAccount.sqf
	persistence/players/s_setupPlayerDB.sqf
	persistence/server/default/players/deletePlayerSave.sqf
	persistence/server/default/world/oSave.sqf
	server/default_config.sqf
	server/functions/fn_refillbox.sqf
	server/functions/netTime.sqf
	server/functions/serverVars.sqf
	server/functions/vehicleHandleDamage.sqf
	server/functions/vehicleSetup.sqf
	server/functions/vehicleSpawning.sqf
	server/init.sqf
	server/missions/factoryMethods/createMissionVehicle.sqf
	server/missions/factoryMethods/createSupplyDrop.sqf
	server/missions/factoryMethods/createUnits/midGroup.sqf
	server/missions/factoryMethods/createUnits/smallGroup.sqf
	server/missions/factoryMethods/mainMissionDefines.sqf
	server/missions/mainMissionController.sqf
	server/missions/mainMissions/mainMissionDefines.sqf
	server/missions/mainMissions/mission_APC.sqf
	server/missions/mainMissions/mission_ArmedDiversquad.sqf
	server/missions/mainMissions/mission_ArmedHeli.sqf
	server/missions/mainMissions/mission_CivHeli.sqf
	server/missions/mainMissions/mission_Coastal_Convoy.sqf
	server/missions/mainMissions/mission_Convoy.sqf
	server/missions/mainMissions/mission_Heli.sqf
	server/missions/mainMissions/mission_HostileHeliFormation.sqf
	server/missions/mainMissions/mission_LightArmVeh.sqf
	server/missions/mainMissions/mission_LightTank.sqf
	server/missions/mainMissions/mission_MBT.sqf
	server/missions/mainMissions/mission_Outpost.sqf
	server/missions/mainMissions/mission_RadarTruck.sqf
	server/missions/mainMissions/mission_SupplyDrop.sqf
	server/missions/moneyMissionController.sqf
	server/missions/moneyMissions/mission_MobMoney.sqf
	server/missions/moneyMissions/mission_MoneyShipment.sqf
	server/missions/moneyMissions/moneyMissionDefines.sqf
	server/missions/otherMissions/mission_AbaBase.sqf
	server/missions/outposts/JoSchaap01.sqf
	server/missions/outposts/JoSchaap02.sqf
	server/missions/outposts/JoSchaap03.sqf
	server/missions/sideMissionController.sqf
	server/missions/sideMissions/mission_AirWreck.sqf
	server/missions/sideMissions/mission_HostileHelicopter.sqf
	server/missions/sideMissions/mission_MiniConvoy.sqf
	server/missions/sideMissions/mission_ReconVeh.sqf
	server/missions/sideMissions/mission_SunkenSupplys.sqf
	server/missions/sideMissions/mission_Truck.sqf
	server/missions/sideMissions/mission_WepCache.sqf
	server/missions/sideMissions/sideMissionDefines.sqf
	server/spawning/staticHeliCreation.sqf
	storeConfig.sqf
	stringtable.xml (reverted from commit 0bdb93719dbf49487776d01f0560730d44f58743)