Merge remote-tracking branch 'upstream/Development_main' into Development_main
Merge remote-tracking branch 'upstream/Development_main' into Development_main
Merge pull request #1 from A3Armory/Development_main

Merge from A3Armory
Basic functions and properties
Merge branch 'mines_saving' of github.com:A3Armory/ArmA3_Wasteland.Altis into mines_saving

Conflicts:
	persistence/world/functions.sqf
	server/default_config.sqf