Version number

Conflicts:
	mission.sqm
	stringtable.xml
Added empty group cleanup
UI optimizations, fixed store menu size on smaller aspect ratios

Conflicts:
	client/systems/adminPanel/dialog/playerMenu.hpp
	client/systems/common.hpp
	client/systems/generalStore/dialog/genstore_settings.hpp
	client/systems/vehicleStore/dialog/vehiclestore_settings.hpp
Forgot to add file
New loading picture, courtesy of bodybag @ www.gameaholic.se

Conflicts:
	Loading.jpg
Fixed minor issues in UI files

Conflicts:
	client/gui_base.hpp
Added custom scoreboard (grab new publicVariable.txt!!!)
Moar money duping fixes (thx @IvanMMM)
Added mission & purchased vehicle saving
Other minor fixes
Full rewrite of the mission system

Conflicts:
	config.sqf
	description.ext
	mission.sqm
	server/missions/mainMissions/mainMissionDefines.sqf
	server/missions/mainMissions/mission_ArmedDiversquad.sqf
	server/missions/mainMissions/mission_Coastal_Convoy.sqf
	server/missions/mainMissions/mission_Convoy.sqf
	server/missions/mainMissions/mission_HostileHeliFormation.sqf
	server/missions/moneyMissions/mission_MoneyShipment.sqf
	server/missions/sideMissions/mission_HostileHelicopter.sqf
	server/missions/sideMissions/mission_MiniConvoy.sqf
	server/missions/sideMissions/mission_SunkenSupplys.sqf
	server/missions/sideMissions/mission_WepCache.sqf
	server/missions/sideMissions/sideMissionDefines.sqf
	server/missions/worldMissionController.sqf
	storeConfig.sqf
Minor fixes

Conflicts:
	client/systems/adminPanel/toggleGodMode.sqf
Improvements to vehicle saving
Added player markers to GPS and UAV Terminal
Windows key now toggles marker names too
Added holster actions from @l0dac
Changed "v1 beta" to "v1 release candidate"
Fix for Arma 3 Tools Publisher crash
Oops
GNU Affero GPL v3

Conflicts:
	client/functions/placePurchasedCrate.sqf
	client/gui_base.hpp
	client/inventory/create.sqf
	client/inventory/list.sqf
	client/items/jerrycan/can_syphon.sqf
	client/items/jerrycan/syphon.sqf
	client/items/misc/can_repair.sqf
	client/items/warchest/access.sqf
	client/items/warchest/can_access.sqf
	client/items/warchest/can_hack.sqf
	client/items/warchest/can_pack.sqf
	client/items/warchest/defines.sqf
	client/items/warchest/deploy.sqf
	client/items/warchest/deposit.sqf
	client/items/warchest/dialog.hpp
	client/items/warchest/hack.sqf
	client/items/warchest/mutex.sqf
	client/items/warchest/nearest.sqf
	client/items/warchest/pack.sqf
	client/items/warchest/refresh.sqf
	client/items/warchest/withdraw.sqf
	client/systems/adminPanel/dialog/playerMenu.hpp
	client/systems/adminPanel/toggleGodMode.sqf
	client/systems/common.hpp
	client/systems/generalStore/dialog/genstore_settings.hpp
	client/systems/generalStore/populateGenStore.sqf
	client/systems/gunStore/buyAmmo.sqf
	client/systems/gunStore/populateGunStore.sqf
	client/systems/vehicleStore/dialog/vehiclestore_settings.hpp
	client/systems/vehicleStore/loadVehicleStore.sqf
	client/systems/vehicleStore/populateVehicleStore.sqf
	config.sqf
	mapConfig/convoys/CoastalConvoy_2.sqf
	mapConfig/convoys/CoastalConvoy_3.sqf
	mapConfig/convoys/LandConvoy_2.sqf
	mapConfig/convoys/LandConvoy_3.sqf
	server/functions/serverTimeSync.sqf
	server/missions/sideMissions/mission_WepCache.sqf
	storeConfig.sqf
Converted ANSI to UTF-8 without BOM

Conflicts:
	client/functions/placePurchasedCrate.sqf
	client/gui_base.hpp
	client/inventory/create.sqf
	client/inventory/list.sqf
	client/items/jerrycan/can_syphon.sqf
	client/items/jerrycan/syphon.sqf
	client/items/misc/can_repair.sqf
	client/items/warchest/access.sqf
	client/items/warchest/can_access.sqf
	client/items/warchest/can_hack.sqf
	client/items/warchest/can_pack.sqf
	client/items/warchest/defines.sqf
	client/items/warchest/deploy.sqf
	client/items/warchest/deposit.sqf
	client/items/warchest/dialog.hpp
	client/items/warchest/hack.sqf
	client/items/warchest/mutex.sqf
	client/items/warchest/nearest.sqf
	client/items/warchest/pack.sqf
	client/items/warchest/refresh.sqf
	client/items/warchest/withdraw.sqf
	client/systems/adminPanel/dialog/playerMenu.hpp
	client/systems/adminPanel/toggleGodMode.sqf
	client/systems/common.hpp
	client/systems/generalStore/dialog/genstore_settings.hpp
	client/systems/generalStore/populateGenStore.sqf
	client/systems/gunStore/buyAmmo.sqf
	client/systems/gunStore/populateGunStore.sqf
	client/systems/vehicleStore/dialog/vehiclestore_settings.hpp
	client/systems/vehicleStore/loadVehicleStore.sqf
	client/systems/vehicleStore/populateVehicleStore.sqf
	config.sqf
	mapConfig/convoys/CoastalConvoy_2.sqf
	mapConfig/convoys/CoastalConvoy_3.sqf
	mapConfig/convoys/LandConvoy_2.sqf
	mapConfig/convoys/LandConvoy_3.sqf
	mission.sqm
	server/functions/serverTimeSync.sqf
	server/missions/sideMissions/mission_WepCache.sqf
	storeConfig.sqf