Merge remote-tracking branch 'refs/remotes/origin/master' into Detection

# Conflicts:
#	Moose Test
Missions/Moose_Test_DETECTION/Moose_Test_DETECTION_Laser.miz

Moose Test Missions/Moose_Test_TASK_SEAD/Moose_Test_TASK_SEAD.lua

@@ -9,29 +9,7 @@ local TargetSet = SET_UNIT:New():FilterPrefixes( "US Hawk SR" ):FilterStart()
 
 local TargetZone = ZONE:New( "Target Zone" )
 
-local Task_Menu = TASK2_MENU_CLIENT:New( Mission, Client, "SEAD" )
-local Task_Route = TASK2_ROUTE_CLIENT:New( Mission, Client, TargetZone ) -- The target location is dynamically defined in state machine
-local Task_Client_Sead = TASK2_SEAD_CLIENT:New( Mission, Client, TargetSet )
-
-Task_Client_Sead:AddScore( "Destroy", "Destroyed RADAR", 25 )
-Task_Client_Sead:AddScore( "Success", "Destroyed all radars!!!", 100 )
-
-local Task_Sead = STATEMACHINE:New( {
-    initial = 'None',
-    events = {
-      { name = 'Start',   from = 'None',          to = 'Unassigned' },
-      { name = 'Next',    from = 'Unassigned',    to = 'Assigned' },
-      { name = 'Next',    from = 'Assigned',      to = 'Success' },
-      { name = 'Fail',    from = 'Assigned',      to = 'Failed' }, 
-      { name = 'Fail',    from = 'Arrived',       to = 'Failed' }     
-    },
-    subs = {
-      Menu = {    onstateparent = 'Unassigned',       oneventparent = 'Start',        fsm = Task_Menu.Fsm,          event = 'Menu',       returnevents = { 'Next' } },
-      Route = {   onstateparent = 'Assigned',         oneventparent = 'Next',         fsm = Task_Route.Fsm,         event = 'Route'       },
-      Sead = {    onstateparent = 'Assigned',         oneventparent = 'Next',         fsm = Task_Client_Sead.Fsm,   event = 'Await',      returnevents = { 'Next' } }
-    }
-  } )
-
-Task_Sead:Start()
+local Task_SEAD = TASK_SEAD:New( TargetSet, TargetZone )
+