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

# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
#	Moose Test Missions/SPA - Spawning/SPA-010 - Spawn Demo/SPA-010 -
Spawn Demo.miz
#	Moose Test Missions/SPA - Spawning/SPA-011 - Ground Ops - Simple
Spawning/SPA-011 - Ground Ops - Simple Spawning.miz
#	Moose Test Missions/SPA - Spawning/SPA-012 - Ground Ops - Multiple
Spawns/SPA-012 - Ground Ops - Multiple Spawns.miz
#	Moose Test Missions/SPA - Spawning/SPA-013 - Ground Ops - Scheduled
Spawns/SPA-013 - Ground Ops - Scheduled Spawns.miz
#	Moose Test Missions/SPA - Spawning/SPA-014 - Ground Ops - Scheduled
Spawns Limited/SPA-014 - Ground Ops - Scheduled Spawns Limited.miz
#	Moose Test Missions/SPA - Spawning/SPA-015 - Ground Ops - Randomize
Route/SPA-015 - Ground Ops - Randomize Route.miz
#	Moose Test Missions/SPA - Spawning/SPA-016 - Ground Ops - Randomize
Zones/SPA-016 - Ground Ops - Randomize Zones.miz
#	Moose Test Missions/SPA - Spawning/SPA-017 - Ground Ops - Set AI
inactive while spawning/SPA-017 - Ground Ops - Set AI inactive while
spawning.miz
#	Moose Test Missions/SPA - Spawning/SPA-018 - Ground Ops - Randomize
Templates/SPA-018 - Ground Ops - Randomize Templates.miz
#	Moose Test Missions/SPA - Spawning/SPA-100 - CleanUp Inactive
Units/SPA-100 - CleanUp Inactive Units.miz
#	Moose Test Missions/SPA - Spawning/SPA-110 - Limit Spawning/SPA-110 -
Limit Spawning.miz
#	Moose Test Missions/SPA - Spawning/SPA-121 - Air Ops - Scheduled
Spawns with Repeat on Landing with Limit/SPA-121 - Air Ops - Scheduled
Spawns with Repeat on Landing with Limit.miz
#	Moose Test Missions/SPA - Spawning/SPA-130 - Uncontrolled
Spawning/SPA-130 - Uncontrolled Spawning.miz
#	Moose Test Missions/SPA - Spawning/SPA-200 - Randomize Unit
Types/SPA-200 - Randomize Unit Types.miz
#	Moose Test Missions/SPA - Spawning/SPA-220 - Randomize Zones/SPA-220 -
Randomize Zones.miz
#	Moose Test Missions/SPA - Spawning/SPA-310 - Spawn at Static
position/SPA-310 - Spawn at Static position.miz
#	Moose Test Missions/SPA - Spawning/SPA-320 - Spawn at Unit
position/SPA-320 - Spawn at Unit position.miz
#	Moose Test Missions/SPA - Spawning/SPA-330 - Spawn at Vec2
position/SPA-330 - Spawn at Vec2 position.miz
#	Moose Test Missions/SPA - Spawning/SPA-340 - Spawn at Vec3
position/SPA-340 - Spawn at Vec3 position.miz
#	Moose Test Missions/ZON - Zones/ZON-100 - Normal Zone/ZON-100 - Normal
Zone.miz
#	docs/Documentation/Zone.html

Moose Test Missions/SPA - Spawning/SPA-018 - Ground Ops - Randomize Templates/SPA-018 - Ground Ops - Randomize Templates.lua

@@ -1,6 +1,7 @@
+---
 -- Name: SPA-018 - Ground Ops - Randomize Templates
 -- Author: FlightControl
--- Date Created: 10 January 2017
+-- Date Created: 10 Jan 2017
 --
 -- # Situation:
 --

Moose Test Missions/SPA - Spawning/SPA-019 - Ground Ops - Randomize Templates without Waypoints/SPA-019 - Ground Ops - Randomize Templates without Waypoints.lua

@@ -0,0 +1,27 @@
+---
+-- Name: SPA-019 - Ground Ops - Randomize Templates with Waypoints
+-- Author: FlightControl
+-- Date Created: 24 Feb 2017
+--
+-- # Situation:
+--
+-- At Gudauta spawn multiple ground vehicles, in a scheduled fashion.
+-- 
+-- # Test cases:
+-- 
+-- 1. Observe that the ground vehicles are spawned with randomized templates.
+-- 2. Observe that the ground vehicles are spread around the spawning area and are not stacked upon each other.
+
+
+-- Tests Gudauta
+-- -------------
+-- Create a zone table of the 2 zones.
+ZoneTable = { ZONE:New( "Zone1" ), ZONE:New( "Zone2" ) }
+
+TemplateTable = { "A", "B", "C" }
+
+Spawn_Vehicle_1 = SPAWN:New( "Spawn Vehicle 1" )
+  :InitLimit( 10, 10 )
+  :InitRandomizeTemplate( TemplateTable ) 
+  :SpawnScheduled( 5, .5 )
+

Moose Test Missions/SPA - Spawning/SPA-020 - Ground Ops - Randomize Templates in Random Zones without Waypoints/SPA-020 - Ground Ops - Randomize Templates in Random Zones without Waypoints.lua

@@ -0,0 +1,29 @@
+---
+-- Name: SPA-020 - Ground Ops - Randomize Templates in Random Zones without Waypoints
+-- Author: FlightControl
+-- Date Created: 24 Feb 2017
+--
+-- # Situation:
+--
+-- At Gudauta spawn multiple ground vehicles, in a scheduled fashion.
+-- 
+-- # Test cases:
+-- 
+-- 1. Observe that the ground vehicles are spawned with randomized templates.
+-- 2. Observe that the ground vehicles are spread around the spawning area and are not stacked upon each other.
+-- 3. Observe that the ground vehicles are spread over the random zones, and that the initial templates formations are kept.
+
+
+-- Tests Gudauta
+-- -------------
+-- Create a zone table of the 2 zones.
+ZoneTable = { ZONE:New( "Zone1" ), ZONE:New( "Zone2" ) }
+
+TemplateTable = { "A", "B", "C" }
+
+Spawn_Vehicle_1 = SPAWN:New( "Spawn Vehicle 1" )
+  :InitLimit( 100, 10 )
+  :InitRandomizeTemplate( TemplateTable ) 
+  :InitRandomizeZones( ZoneTable )
+  :SpawnScheduled( 5, .5 )
+