Merge remote-tracking branch 'refs/remotes/origin/Release-2.2.0'

# Conflicts:
#	Moose Mission Setup/Moose.lua
#	Moose Mission Setup/Moose_.lua

docs/Documentation/Fsm.html

@@ -1605,7 +1605,7 @@ A string defining the start state.</p>
 		<dl class="function">
 <dt>
 
-		<em></em>
+		<em>#string</em>
 <a id="#(FSM)._StartState" >
 <strong>FSM._StartState</strong>
 </a>
@@ -1904,7 +1904,6 @@ A string defining the start state.</p>
 		<dl class="function">
 <dt>
 
-		<em></em>
 <a id="#(FSM).current" >
 <strong>FSM.current</strong>
 </a>

docs/Documentation/Positionable.html

@@ -1980,6 +1980,7 @@ The height in meters to add to the altitude of the positionable.</p>
 		<dl class="function">
 <dt>
 
+		<em><a href="Core.Spot.html##(SPOT)">Core.Spot#SPOT</a></em>
 <a id="#(POSITIONABLE).Spot" >
 <strong>POSITIONABLE.Spot</strong>
 </a>

docs/Documentation/Scoring.html

@@ -223,7 +223,9 @@ just large enough around that building.</p>
 <p>A mission has goals and achievements. The scoring system provides an API to set additional scores when a goal or achievement event happens.
 Use the method <a href="##(SCORING).AddGoalScore">SCORING.AddGoalScore</a>() to add a score for a Player at any time in your mission.</p>
 
-<h2>1.5) Configure fratricide level.</h2>
+<h2>1.5) (Decommissioned) Configure fratricide level.</h2>
+
+<p><strong>This functionality is decomissioned until the DCS bug concerning Unit:destroy() not being functional in multi player for player units has been fixed by ED</strong>.</p>
 
 <p>When a player commits too much damage to friendlies, his penalty score will reach a certain level.
 Use the method <a href="##(SCORING).SetFratricide">SCORING.SetFratricide</a>() to define the level when a player gets kicked. <br/>

docs/Documentation/Settings.html

@@ -1247,7 +1247,7 @@ true if metric.</p>
 		<dl class="function">
 <dt>
 
-		<em>#boolean</em>
+		<em></em>
 <a id="#(SETTINGS).Metric" >
 <strong>SETTINGS.Metric</strong>
 </a>

docs/Documentation/Spawn.html

@@ -3166,7 +3166,7 @@ Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):Schedule( 600, 0.5 )
 		<dl class="function">
 <dt>
 
-		<em></em>
+		<em>#boolean</em>
 <a id="#(SPAWN).SpawnUnControlled" >
 <strong>SPAWN.SpawnUnControlled</strong>
 </a>

docs/Documentation/Task_Cargo.html

@@ -573,6 +573,7 @@ based on the tasking capabilities defined in <a href="Task.html##(TASK)">Task#TA
 		<dl class="function">
 <dt>
 
+		<em></em>
 <a id="#(FSM_PROCESS).DeployZone" >
 <strong>FSM_PROCESS.DeployZone</strong>
 </a>