Merge branch 'Development_main' into v1_beta
couple of fixes for the server-restart.js script
Merge branch 'Development_main' into v1_beta

Conflicts:
	node-scripts/server-restart.js
Merge branch 'Development_main' into v1_beta
Merge branch 'Development_main' into v1_beta
Merge remote-tracking branch 'upstream/v1_beta' into v1_beta

Conflicts:
	addons/R3F_ARTY_AND_LOG/R3F_LOG/objet_deplacable/objectLockStateMachine.sqf
	client/functions/playerSetupEnd.sqf
	persistence/fn_inidb_custom.sqf
	persistence/players/c_applyPlayerData.sqf
	persistence/players/c_applyPlayerInfo.sqf
	persistence/players/c_savePlayerData.sqf
	persistence/players/c_setupPlayerDB.sqf
	persistence/players/s_deletePlayerSave.sqf
	persistence/players/s_loadAccount.sqf
	persistence/players/s_setupPlayerDB.sqf
	persistence/world/oLoad.sqf
	persistence/world/oSave.sqf
	persistence/world/vLoad.sqf
	server/init.sqf
Fix defect, wrong variable name, _obj vs _object
Merge remote-tracking branch 'upstream/v1_beta' into v1_beta

Conflicts:
	persistence/world/oSave.sqf
Merge branch 'Development_main' into v1_beta

Conflicts:
	server/default_config.sqf
Update README.md
Merge branch 'Development_main' into v1_beta

Conflicts:
	addons/R3F_ARTY_AND_LOG/R3F_LOG/objet_deplacable/objectLockStateMachine.sqf
Merge branch 'v1_beta' of https://github.com/micovery/ArmA3_Wasteland.Altis into v1_beta
Merge branch 'Development_main' into v1_beta
Merge remote-tracking branch 'upstream/v1_beta' into v1_beta
Merge branch 'Development_main' into v1_beta
Merge branch 'Development_main' into v1_beta
fix #14 textures not saving/loading
automatically add bought vehicle to the tracked list
put player back into vehicle on loading
Merge branch 'v1_beta' into Development_main

Some bug fixes did not make it form v1_beta, adding those now.
Conflicts:
	addons/R3F_ARTY_AND_LOG/R3F_LOG/objet_deplacable/objectLockStateMachine.sqf
	persistence/players/pFunctions.sqf
	persistence/players/s_setupPlayerDB.sqf
	persistence/world/oLoad.sqf
	server/default_config.sqf
	server/functions/spawnStoreObject.sqf