From 485b48a7eef97f927c193ddad0ef38c605cbe1b2 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Fri, 2 Oct 2020 14:41:31 +0100
Subject: [PATCH 01/25] look for connecting drivers in the connected drivers
 table to avoid losing laps

---
 CHANGELOG.md    | 9 +++++++++
 race_control.go | 9 +++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1c04588d..46fdc155b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+v1.7.9
+------
+
+Fixed:
+
+* Fixes an issue where Live Timings lap counts could reset if a driver does not cleanly disconnect from the Assetto Corsa Server.
+
+---
+
 v1.7.8
 ------
 
diff --git a/race_control.go b/race_control.go
index 2acb078d5..158842414 100644
--- a/race_control.go
+++ b/race_control.go
@@ -624,8 +624,13 @@ func (rc *RaceControl) OnClientConnect(client udp.SessionCarInfo) error {
 		logrus.Debugf("Driver %s (%s) reconnected in %s (car id: %d)", driver.CarInfo.DriverName, driver.CarInfo.DriverGUID, driver.CarInfo.CarModel, client.CarID)
 		rc.DisconnectedDrivers.Del(client.DriverGUID)
 	} else {
-		driver = NewRaceControlDriver(client)
-		logrus.Debugf("Driver %s (%s) connected in %s (car id: %d)", driver.CarInfo.DriverName, driver.CarInfo.DriverGUID, driver.CarInfo.CarModel, client.CarID)
+		if connectedDriver, ok := rc.ConnectedDrivers.Get(client.DriverGUID); ok {
+			driver = connectedDriver
+			logrus.Debugf("Driver %s (%s) reconnected (but was already connected...) in %s (car id: %d)", driver.CarInfo.DriverName, driver.CarInfo.DriverGUID, driver.CarInfo.CarModel, client.CarID)
+		} else {
+			driver = NewRaceControlDriver(client)
+			logrus.Debugf("Driver %s (%s) connected in %s (car id: %d)", driver.CarInfo.DriverName, driver.CarInfo.DriverGUID, driver.CarInfo.CarModel, client.CarID)
+		}
 	}
 
 	driver.mutex.Lock()

From 41acb1d5985f2487dcf30cf61aaad8aea440e710 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Mon, 19 Oct 2020 11:20:03 +0100
Subject: [PATCH 02/25] correct variable names of real penalty jump start
 options so that they work correctly (fixes #1021)

---
 CHANGELOG.md                 | 1 +
 plugin_realpenalty_config.go | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46fdc155b..f87256ae4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ v1.7.9
 Fixed:
 
 * Fixes an issue where Live Timings lap counts could reset if a driver does not cleanly disconnect from the Assetto Corsa Server.
+* Fixes an issue where Real Penalty config values for Jump Start would not be assigned correctly.
 
 ---
 
diff --git a/plugin_realpenalty_config.go b/plugin_realpenalty_config.go
index 2f739c004..e44767a7a 100644
--- a/plugin_realpenalty_config.go
+++ b/plugin_realpenalty_config.go
@@ -345,11 +345,11 @@ type RealPenaltySettingsJumpStart struct {
 	PenaltyType0       string `ini:"PENALTY_TYPE_0" help:"Penalty type for jump start. Don't set seconds penalty! dt = drive through, sgn = stop and go n seconds, dsq = disqualification --> kick"`
 	SpeedLimitPenalty0 int    `ini:"SPEED_LIMIT_PENALTY_0" help:""`
 
-	PenaltyType1       string `ini:"PENALTY_TYPE_0" help:""`
-	SpeedLimitPenalty1 int    `ini:"SPEED_LIMIT_PENALTY_0" help:"Penalty type for jump start. Don't set seconds penalty! dt = drive through, sgn = stop and go n seconds, dsq = disqualification --> kick"`
+	PenaltyType1       string `ini:"PENALTY_TYPE_1" help:""`
+	SpeedLimitPenalty1 int    `ini:"SPEED_LIMIT_PENALTY_1" help:"Penalty type for jump start. Don't set seconds penalty! dt = drive through, sgn = stop and go n seconds, dsq = disqualification --> kick"`
 
-	PenaltyType2       string `ini:"PENALTY_TYPE_0" help:""`
-	SpeedLimitPenalty2 int    `ini:"SPEED_LIMIT_PENALTY_0" help:"Penalty type for jump start. Don't set seconds penalty! dt = drive through, sgn = stop and go n seconds, dsq = disqualification --> kick"`
+	PenaltyType2       string `ini:"PENALTY_TYPE_2" help:""`
+	SpeedLimitPenalty2 int    `ini:"SPEED_LIMIT_PENALTY_2" help:"Penalty type for jump start. Don't set seconds penalty! dt = drive through, sgn = stop and go n seconds, dsq = disqualification --> kick"`
 }
 
 type RealPenaltySettingsDRS struct {

From dcd8956396f384d082edebb22dbfeb4c33dfce55 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Tue, 27 Oct 2020 14:54:40 +0000
Subject: [PATCH 03/25] only filter the spectator car from points calculations
 if the spectator car toggle is enabled

---
 CHANGELOG.md     | 1 +
 championships.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f87256ae4..70e32e517 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Fixed:
 
 * Fixes an issue where Live Timings lap counts could reset if a driver does not cleanly disconnect from the Assetto Corsa Server.
 * Fixes an issue where Real Penalty config values for Jump Start would not be assigned correctly.
+* The Spectator Car will only be filtered out from Championship Points calculations if Spectator Car is enabled in the Championship settings.
 
 ---
 
diff --git a/championships.go b/championships.go
index 39f8be04e..fb4b10e79 100644
--- a/championships.go
+++ b/championships.go
@@ -1043,7 +1043,7 @@ func (c *Championship) AttachClassIDToResults(results *SessionResults) {
 
 func (c *ChampionshipClass) ResultsForClass(results []*SessionResult, championship *Championship) (filtered []*SessionResult) {
 	for _, result := range results {
-		if c.DriverInClass(result) && result.TotalTime > 0 && result.DriverGUID != championship.SpectatorCar.GUID {
+		if c.DriverInClass(result) && result.TotalTime > 0 && (!championship.SpectatorCarEnabled || result.DriverGUID != championship.SpectatorCar.GUID) {
 			filtered = append(filtered, result)
 		}
 	}

From 3abfaa9f5ba560f2aa62921dcdd48bb8da4885cd Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Wed, 28 Oct 2020 16:52:25 +0000
Subject: [PATCH 04/25] fixes an issue where cars could be duplicated in a race
 setup

---
 CHANGELOG.md                                  |  1 +
 .../typescript/src/CarSearch.ts               |  6 +-
 migrations.go                                 | 89 +++++++++++++++++++
 3 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70e32e517..bc02f69d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Fixed:
 * Fixes an issue where Live Timings lap counts could reset if a driver does not cleanly disconnect from the Assetto Corsa Server.
 * Fixes an issue where Real Penalty config values for Jump Start would not be assigned correctly.
 * The Spectator Car will only be filtered out from Championship Points calculations if Spectator Car is enabled in the Championship settings.
+* Fixes an issue where cars could be duplicated in race setups
 
 ---
 
diff --git a/cmd/server-manager/typescript/src/CarSearch.ts b/cmd/server-manager/typescript/src/CarSearch.ts
index 44dfc0528..72c95f244 100644
--- a/cmd/server-manager/typescript/src/CarSearch.ts
+++ b/cmd/server-manager/typescript/src/CarSearch.ts
@@ -51,10 +51,14 @@ export class CarSearch {
             }
 
             for (const car of data) {
+                if ($carsSelect.find("option[value='" + car.CarID + "']").length) {
+                    continue;
+                }
+
                 $carsSelect.append('<option value=' + car.CarID + " class=" + car.Class + ">" + car.CarName + "</option>")
             }
 
             $carsSelect.multiSelect('refresh');
         });
     }
-}
\ No newline at end of file
+}
diff --git a/migrations.go b/migrations.go
index cf8319d9c..275b8e9ca 100644
--- a/migrations.go
+++ b/migrations.go
@@ -87,6 +87,7 @@ var (
 		addCorrectCarNameToLiveTimingsData,
 		addDefaultACSRGateOptionsToChampionships,
 		addSplitTypeToRaceWeekends,
+		fixCarDuplicationInRaceSetups,
 	}
 )
 
@@ -1092,3 +1093,91 @@ func addSplitTypeToRaceWeekends(s Store) error {
 
 	return nil
 }
+
+func fixCarDuplicationInRaceSetups(s Store) error {
+	uniq := func(s []string) []string {
+		filtered := make(map[string]bool)
+
+		for _, x := range s {
+			filtered[x] = true
+		}
+
+		var out []string
+
+		for x := range filtered {
+			out = append(out, x)
+		}
+
+		return out
+	}
+
+	fix := func(cars string) string {
+		return strings.Join(uniq(strings.Split(cars, ";")), ";")
+	}
+
+	logrus.Infof("Running migration: Fix duplicate cars in race setups")
+
+	customRaces, err := s.ListCustomRaces()
+
+	if err != nil {
+		return err
+	}
+
+	sort.Slice(customRaces, func(i, j int) bool {
+		return customRaces[i].Updated.Before(customRaces[j].Updated)
+	})
+
+	for _, race := range customRaces {
+		race.RaceConfig.Cars = fix(race.RaceConfig.Cars)
+
+		if err := s.UpsertCustomRace(race); err != nil {
+			return err
+		}
+	}
+
+	championships, err := s.ListChampionships()
+
+	if err != nil {
+		return err
+	}
+
+	sort.Slice(championships, func(i, j int) bool {
+		return championships[i].Updated.Before(championships[j].Updated)
+	})
+
+	for _, championship := range championships {
+		for _, event := range championship.Events {
+			if event.IsRaceWeekend() {
+				continue
+			}
+
+			event.RaceSetup.Cars = fix(event.RaceSetup.Cars)
+		}
+
+		if err := s.UpsertChampionship(championship); err != nil {
+			return err
+		}
+	}
+
+	raceWeekends, err := s.ListRaceWeekends()
+
+	if err != nil {
+		return err
+	}
+
+	sort.Slice(raceWeekends, func(i, j int) bool {
+		return raceWeekends[i].Updated.Before(raceWeekends[j].Updated)
+	})
+
+	for _, raceWeekend := range raceWeekends {
+		for _, session := range raceWeekend.Sessions {
+			session.RaceConfig.Cars = fix(session.RaceConfig.Cars)
+		}
+
+		if err := s.UpsertRaceWeekend(raceWeekend); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

From 129a6e35cda6797cece733519837e40c03dc4f5d Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Fri, 6 Nov 2020 10:56:52 +0000
Subject: [PATCH 05/25] lock track info with a mutex to prevent a concurrent
 map rw crash

---
 CHANGELOG.md | 1 +
 templates.go | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc02f69d0..bbc6e2093 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Fixed:
 * Fixes an issue where Real Penalty config values for Jump Start would not be assigned correctly.
 * The Spectator Car will only be filtered out from Championship Points calculations if Spectator Car is enabled in the Championship settings.
 * Fixes an issue where cars could be duplicated in race setups
+* Fixes a crash that could occur when displaying information about a track.
 
 ---
 
diff --git a/templates.go b/templates.go
index e48e6e897..93d3bd475 100644
--- a/templates.go
+++ b/templates.go
@@ -399,9 +399,15 @@ func varSplit(str string) []string {
 	return strings.Split(str, ";")
 }
 
-var trackInfoCache = make(map[string]*TrackInfo)
+var (
+	trackInfoCache      = make(map[string]*TrackInfo)
+	trackInfoCacheMutex sync.Mutex
+)
 
 func trackInfo(track, layout string) *TrackInfo {
+	trackInfoCacheMutex.Lock()
+	defer trackInfoCacheMutex.Unlock()
+
 	if t, ok := trackInfoCache[track+layout]; ok {
 		return t
 	}

From 3f4959ed061d1129b6d71b9ec16a53614f92a2d1 Mon Sep 17 00:00:00 2001
From: Justin Mayfield <tooker@gmail.com>
Date: Mon, 9 Nov 2020 16:51:52 -0700
Subject: [PATCH 06/25] Graceful plugin and acServer shutdown.

Refactor the plugin kill call to try a SIGINT for some time then use
SIGKILL as required.  In all cases a cmd.Wait is called which ensures
the process is reaped (e.g no defunct procs).

This change mitigates a plugin restart race conditions where the process
being killed is not fully shutdown before a new one is started.  Ie. Issues
with TCP port bind() calls failing when an existing process was not fully terminated.

Related to #1030
---
 server_process.go            | 63 +++++++++++++++++++++++++++++-------
 server_process_nonwindows.go | 35 ++++++++++----------
 server_process_windows.go    | 17 +++++++---
 3 files changed, 80 insertions(+), 35 deletions(-)

diff --git a/server_process.go b/server_process.go
index c197ab050..139fa512d 100644
--- a/server_process.go
+++ b/server_process.go
@@ -176,13 +176,15 @@ func (sp *AssettoServerProcess) Stop() error {
 		}
 	}()
 
-	if err := kill(sp.cmd.Process); err != nil {
-		logrus.WithError(err).Error("Could not forcibly kill command")
+	logrus.Infof("Shutting down server process: %d", sp.cmd.Process.Pid)
+	stopErr := stopCommand(sp.cmd, errCh, 30)
+	if stopErr != nil {
+		logrus.WithError(stopErr).Errorf("Failed to stop server process: %d", sp.cmd.Process.Pid)
 	}
 
 	sp.cfn()
 
-	return <-errCh
+	return stopErr
 }
 
 func (sp *AssettoServerProcess) Restart() error {
@@ -572,7 +574,9 @@ func (sp *AssettoServerProcess) onStop() error {
 		return err
 	}
 
-	sp.stopChildProcesses()
+	if err := sp.stopChildProcesses(); err != nil {
+		return err
+	}
 
 	for _, doneCh := range sp.notifyDoneChs {
 		select {
@@ -716,21 +720,24 @@ func (sp *AssettoServerProcess) startChildProcess(wd string, command string) err
 	return nil
 }
 
-func (sp *AssettoServerProcess) stopChildProcesses() {
+func (sp *AssettoServerProcess) stopChildProcesses() error {
 	sp.contentManagerWrapper.Stop()
 
 	for _, command := range sp.extraProcesses {
-		err := kill(command.Process)
-
-		if err != nil {
-			logrus.WithError(err).Errorf("Can't kill process: %d", command.Process.Pid)
-			continue
+		waitDone := make(chan error, 1)
+		go func() {
+			waitDone <- command.Wait()
+		}()
+		if err := stopCommand(command, waitDone, 30); err != nil {
+			if _, isExit := err.(*exec.ExitError); !isExit {
+				name := filepath.Base(command.Path)
+				logrus.WithError(err).Warnf("Command stop problem: %s [pid: %d]", name, command.Process.Pid)
+			}
 		}
-
-		_ = command.Process.Release()
 	}
 
 	sp.extraProcesses = make([]*exec.Cmd, 0)
+	return nil
 }
 
 func (sp *AssettoServerProcess) startUDPListener() error {
@@ -813,3 +820,35 @@ func FreeUDPPort() (int, error) {
 
 	return l.LocalAddr().(*net.UDPAddr).Port, nil
 }
+
+var ErrCommandUnstopable = errors.New("servermanager: command is unstopable")
+
+func stopCommand(cmd *exec.Cmd, waiter chan error, timeout float32) error {
+	name := filepath.Base(cmd.Path)
+	proc := getProcess(cmd)
+	pid := proc.Pid
+	logrus.Infof("Terminating command: %s [pid: %d]...", name, pid)
+	if err := terminate(proc); err != nil {
+		logrus.WithError(err).Errorf("Failed to terminate command: %s [pid: %d]", name, pid)
+		return err
+	}
+	termWait := timeout / 2
+	killWait := timeout - termWait
+	select {
+	case <-time.After(time.Duration(termWait) * time.Second):
+		logrus.Warnf("Process %d did not terminate after %g seconds. Killing...", pid, termWait)
+		if err := kill(proc); err != nil {
+			logrus.WithError(err).Warnf("Failed to kill command: %s [pid: %d]", name, pid)
+			return err
+		}
+		select {
+		case <-time.After(time.Duration(killWait) * time.Second):
+			logrus.Errorf("Process %d could not be killed after %g seconds.", pid, timeout)
+			return ErrCommandUnstopable
+		case err := <-waiter:
+			return err
+		}
+	case err := <-waiter:
+		return err
+	}
+}
diff --git a/server_process_nonwindows.go b/server_process_nonwindows.go
index 63635249d..bea867035 100644
--- a/server_process_nonwindows.go
+++ b/server_process_nonwindows.go
@@ -7,35 +7,34 @@ import (
 	"os"
 	"os/exec"
 	"syscall"
+
+	"github.com/sirupsen/logrus"
 )
 
 const ServerExecutablePath = "acServer"
 
-func kill(process *os.Process) error {
-	pgid, err := syscall.Getpgid(process.Pid)
-
-	if err != nil {
-		return err
-	}
-
-	err = syscall.Kill(-pgid, syscall.SIGKILL)
-
-	if err != nil {
-		return err
+func getProcess(cmd *exec.Cmd) *os.Process {
+	if pgid, err := syscall.Getpgid(cmd.Process.Pid); err != nil {
+		logrus.WithError(err).Warnf("Failed to get process group for %d. Using pid instead.", pgid)
+		return cmd.Process
+	} else if ps, err := os.FindProcess(pgid); err != nil {
+		logrus.WithError(err).Warnf("Failed to find process for %d. Using pid instead.", pgid)
+		return cmd.Process
+	} else {
+		return ps
 	}
+}
 
-	err = syscall.Kill(-pgid, syscall.SIGINT)
-
-	if err != nil {
-		return err
-	}
+func terminate(ps *os.Process) error {
+	return syscall.Kill(-ps.Pid, syscall.SIGINT)
+}
 
-	return syscall.Kill(-process.Pid, syscall.SIGKILL|syscall.SIGINT)
+func kill(ps *os.Process) error {
+	return syscall.Kill(-ps.Pid, syscall.SIGKILL)
 }
 
 func buildCommand(ctx context.Context, command string, args ...string) *exec.Cmd {
 	cmd := exec.CommandContext(ctx, command, args...)
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
-
 	return cmd
 }
diff --git a/server_process_windows.go b/server_process_windows.go
index bf6d3b891..158c5d39e 100644
--- a/server_process_windows.go
+++ b/server_process_windows.go
@@ -11,12 +11,19 @@ import (
 
 const ServerExecutablePath = "acServer.exe"
 
-func kill(process *os.Process) error {
-	return exec.Command("TASKKILL", "/T", "/F", "/PID", fmt.Sprintf("%d", process.Pid)).Run()
+func getProcess(cmd *exec.Cmd) *os.Process {
+	return cmd.Process
 }
 
-func buildCommand(ctx context.Context, command string, args ...string) *exec.Cmd {
-	cmd := exec.CommandContext(ctx, command, args...)
+func terminate(ps *os.Process) error {
+	// Windows does not support SIGINT or SIGTERM, just nuke it..
+	return kill(ps)
+}
 
-	return cmd
+func kill(ps *os.Process) error {
+	return ps.Kill()
+}
+
+func buildCommand(ctx context.Context, command string, args ...string) *exec.Cmd {
+	return exec.CommandContext(ctx, command, args...)
 }

From 8233116d2a407578c94966b01d48026b0f2edb64 Mon Sep 17 00:00:00 2001
From: Justin Mayfield <tooker@gmail.com>
Date: Mon, 9 Nov 2020 17:17:37 -0700
Subject: [PATCH 07/25] Allow server process more time to shutdown.

Now that plugins each get some time to gracefully shutdown the server
manager needs to be more patient.  Change timeout from 10 to 60 seconds.
---
 server_process.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server_process.go b/server_process.go
index 139fa512d..80518b72d 100644
--- a/server_process.go
+++ b/server_process.go
@@ -162,7 +162,7 @@ func (sp *AssettoServerProcess) Stop() error {
 		}
 	}
 
-	timeout := time.After(time.Second * 10)
+	timeout := time.After(time.Second * 60)
 	errCh := make(chan error)
 
 	go func() {

From 0e84daeb76a36b7051eb4bdab562d29c30cf3dc3 Mon Sep 17 00:00:00 2001
From: Justin Mayfield <tooker@gmail.com>
Date: Tue, 10 Nov 2020 11:54:42 -0700
Subject: [PATCH 08/25] Remove unused `fmt` import on win builds

---
 server_process_windows.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server_process_windows.go b/server_process_windows.go
index 158c5d39e..a636a67f9 100644
--- a/server_process_windows.go
+++ b/server_process_windows.go
@@ -4,7 +4,6 @@ package servermanager
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"os/exec"
 )

From 7199f5f6f222d60657f0ee670e93f255a82cbecb Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Fri, 13 Nov 2020 11:43:28 +0000
Subject: [PATCH 09/25] remove watcher limits on car scanning, so multiple cars
 added at once are detected correctly

---
 CHANGELOG.md    | 1 +
 content_cars.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbc6e2093..391b7d467 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Fixed:
 * The Spectator Car will only be filtered out from Championship Points calculations if Spectator Car is enabled in the Championship settings.
 * Fixes an issue where cars could be duplicated in race setups
 * Fixes a crash that could occur when displaying information about a track.
+* Fixes an issue where multiservers could omit scanning new cars if they were added in groups, rather than one at once. If your server is missing cars in the car list, please "Rebuild Search Index" on the Server Options page!
 
 ---
 
diff --git a/content_cars.go b/content_cars.go
index cbbea5582..d0b58f530 100644
--- a/content_cars.go
+++ b/content_cars.go
@@ -331,7 +331,7 @@ func (cm *CarManager) watchForCarChanges() error {
 		return err
 	}
 
-	w.SetMaxEvents(1)
+	w.SetMaxEvents(0)
 	w.FilterOps(watcher.Create, watcher.Remove)
 	w.AddFilterHook(func(info os.FileInfo, fullPath string) error {
 		if info.IsDir() && info.Name() != "cars" {

From 0696b2d52b4b0a46cef1cc442f0c8ac8ea23334d Mon Sep 17 00:00:00 2001
From: Justin Mayfield <tooker@gmail.com>
Date: Fri, 13 Nov 2020 14:15:23 -0700
Subject: [PATCH 10/25] Revert windows process kill to TASKKILL technique.

The Process.Kill() method is unreliable on windows.
---
 server_process_windows.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server_process_windows.go b/server_process_windows.go
index a636a67f9..a8c16df5f 100644
--- a/server_process_windows.go
+++ b/server_process_windows.go
@@ -4,6 +4,7 @@ package servermanager
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"os/exec"
 )
@@ -20,7 +21,8 @@ func terminate(ps *os.Process) error {
 }
 
 func kill(ps *os.Process) error {
-	return ps.Kill()
+	// Process.Kill() is unreliable for Windows.  Use less aesthetic but reliable method...
+	return exec.Command("TASKKILL", "/T", "/F", "/PID", fmt.Sprintf("%d", ps.Pid)).Run()
 }
 
 func buildCommand(ctx context.Context, command string, args ...string) *exec.Cmd {

From 5be4733352e05085b7a17b40b9b53bd28c7d574d Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Fri, 27 Nov 2020 14:23:41 +0000
Subject: [PATCH 11/25] clear trackInfoCache on track upload (fixes #1036)

---
 CHANGELOG.md      |  1 +
 content_tracks.go |  4 ++++
 content_upload.go | 29 +++++++++++++++++++++++------
 resolver.go       |  2 +-
 templates.go      |  7 +++++++
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 391b7d467..53f811463 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Fixed:
 * Fixes an issue where cars could be duplicated in race setups
 * Fixes a crash that could occur when displaying information about a track.
 * Fixes an issue where multiservers could omit scanning new cars if they were added in groups, rather than one at once. If your server is missing cars in the car list, please "Rebuild Search Index" on the Server Options page!
+* Fixes an issue where track names would not update when a track was reuploaded.
 
 ---
 
diff --git a/content_tracks.go b/content_tracks.go
index 95a37ae64..d9d9d18bd 100644
--- a/content_tracks.go
+++ b/content_tracks.go
@@ -260,6 +260,10 @@ func (th *TracksHandler) delete(w http.ResponseWriter, r *http.Request) {
 				logrus.WithError(err).Errorf("could not remove track files")
 			}
 
+			for _, layout := range track.Layouts {
+				clearFromTrackInfoCache(track.Name, layout)
+			}
+
 			break
 		}
 	}
diff --git a/content_upload.go b/content_upload.go
index 4af249ba5..b6a7c31a8 100644
--- a/content_upload.go
+++ b/content_upload.go
@@ -34,13 +34,15 @@ var base64HeaderRegex = regexp.MustCompile("^(data:.+;base64,)")
 type ContentUploadHandler struct {
 	*BaseHandler
 
-	carManager *CarManager
+	carManager   *CarManager
+	trackManager *TrackManager
 }
 
-func NewContentUploadHandler(baseHandler *BaseHandler, carManager *CarManager) *ContentUploadHandler {
+func NewContentUploadHandler(baseHandler *BaseHandler, carManager *CarManager, trackManager *TrackManager) *ContentUploadHandler {
 	return &ContentUploadHandler{
-		BaseHandler: baseHandler,
-		carManager:  carManager,
+		BaseHandler:  baseHandler,
+		carManager:   carManager,
+		trackManager: trackManager,
 	}
 }
 
@@ -82,6 +84,7 @@ func (cuh *ContentUploadHandler) addFiles(files []ContentFile, contentType Conte
 	}
 
 	uploadedCars := make(map[string]bool)
+	uploadedTracks := make(map[string]bool)
 
 	var tags []string
 
@@ -126,8 +129,11 @@ func (cuh *ContentUploadHandler) addFiles(files []ContentFile, contentType Conte
 			return err
 		}
 
-		if contentType == ContentTypeCar {
+		switch contentType {
+		case ContentTypeCar:
 			uploadedCars[parts[0]] = true
+		case ContentTypeTrack:
+			uploadedTracks[parts[0]] = true
 		}
 
 		err = ioutil.WriteFile(path, fileDecoded, 0644)
@@ -138,7 +144,8 @@ func (cuh *ContentUploadHandler) addFiles(files []ContentFile, contentType Conte
 		}
 	}
 
-	if contentType == ContentTypeCar {
+	switch contentType {
+	case ContentTypeCar:
 		// index the cars that have been uploaded.
 		for car := range uploadedCars {
 			car, err := cuh.carManager.LoadCar(car, nil)
@@ -163,6 +170,16 @@ func (cuh *ContentUploadHandler) addFiles(files []ContentFile, contentType Conte
 				return err
 			}
 		}
+	case ContentTypeTrack:
+		for track := range uploadedTracks {
+			track, err := cuh.trackManager.GetTrackFromName(track)
+
+			if err == nil {
+				for _, layout := range track.Layouts {
+					clearFromTrackInfoCache(track.Name, layout)
+				}
+			}
+		}
 	}
 
 	return nil
diff --git a/resolver.go b/resolver.go
index c700bda8e..9e194f21d 100644
--- a/resolver.go
+++ b/resolver.go
@@ -372,7 +372,7 @@ func (r *Resolver) resolveContentUploadHandler() *ContentUploadHandler {
 		return r.contentUploadHandler
 	}
 
-	r.contentUploadHandler = NewContentUploadHandler(r.resolveBaseHandler(), r.resolveCarManager())
+	r.contentUploadHandler = NewContentUploadHandler(r.resolveBaseHandler(), r.resolveCarManager(), r.resolveTrackManager())
 
 	return r.contentUploadHandler
 }
diff --git a/templates.go b/templates.go
index 93d3bd475..dfef9bc19 100644
--- a/templates.go
+++ b/templates.go
@@ -424,6 +424,13 @@ func trackInfo(track, layout string) *TrackInfo {
 	return t
 }
 
+func clearFromTrackInfoCache(track, layout string) {
+	trackInfoCacheMutex.Lock()
+	defer trackInfoCacheMutex.Unlock()
+
+	delete(trackInfoCache, track+layout)
+}
+
 func multiplyFloats(a, b float64) float64 {
 	return a * b
 }

From 88c3a13163e907dd3aff052e426942b3fb756111 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Mon, 30 Nov 2020 16:11:41 +0000
Subject: [PATCH 12/25] use corrected track info when loading pitbox info in
 race setups

---
 CHANGELOG.md      | 1 +
 content_tracks.go | 9 +++++++++
 router.go         | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53f811463..196febe40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Fixed:
 * Fixes a crash that could occur when displaying information about a track.
 * Fixes an issue where multiservers could omit scanning new cars if they were added in groups, rather than one at once. If your server is missing cars in the car list, please "Rebuild Search Index" on the Server Options page!
 * Fixes an issue where track names would not update when a track was reuploaded.
+* Fixes an issue where pitboxes could not be loaded for a track with an invalid JSON file.
 
 ---
 
diff --git a/content_tracks.go b/content_tracks.go
index d9d9d18bd..7870fd4ca 100644
--- a/content_tracks.go
+++ b/content_tracks.go
@@ -323,6 +323,15 @@ func (th *TracksHandler) trackImage(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func (th *TracksHandler) trackInfo(w http.ResponseWriter, r *http.Request) {
+	track := chi.URLParam(r, "track")
+	layout := chi.URLParam(r, "layout")
+
+	w.Header().Add("Content-Type", "application/json")
+
+	_ = json.NewEncoder(w).Encode(trackInfo(track, layout))
+}
+
 type TrackManager struct {
 }
 
diff --git a/router.go b/router.go
index 198a52b7b..87f27e4d7 100644
--- a/router.go
+++ b/router.go
@@ -180,6 +180,9 @@ func Router(
 		r.Get("/content/tracks/{track}/ui/preview.png", AssetCacheHeaders(http.HandlerFunc(tracksHandler.trackImage), true))
 		r.Get("/content/tracks/{track}/ui/{layout}/preview.png", AssetCacheHeaders(http.HandlerFunc(tracksHandler.trackImage), true))
 
+		r.Get("/content/tracks/{track}/ui/ui_track.json", AssetCacheHeaders(http.HandlerFunc(tracksHandler.trackInfo), true))
+		r.Get("/content/tracks/{track}/ui/{layout}/ui_track.json", AssetCacheHeaders(http.HandlerFunc(tracksHandler.trackInfo), true))
+
 		// race weekends
 		r.Get("/race-weekends", raceWeekendHandler.list)
 		r.Get("/race-weekend/{raceWeekendID}", raceWeekendHandler.view)

From 615b8117cb28df1d3a7a41ff7f65f6f3738f28cf Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Mon, 30 Nov 2020 20:15:00 +0000
Subject: [PATCH 13/25] add a vastly improved track selection dropdown, with
 search and proper track names

---
 CHANGELOG.md                                  |   4 +
 .../typescript/package-lock.json              | 400 +++++++++---------
 cmd/server-manager/typescript/package.json    |   4 +-
 .../typescript/sass/_imports.scss             |   3 +
 .../typescript/sass/_layout.scss              |  18 +-
 cmd/server-manager/typescript/src/Form.ts     |  38 ++
 .../typescript/src/javascript/manager.js      |  34 +-
 cmd/server-manager/typescript/src/main.ts     |   6 +-
 .../views/pages/custom-race/new.html          |  53 ++-
 content_tracks.go                             |  42 +-
 go.mod                                        |   1 +
 go.sum                                        |   2 +
 race_manager.go                               |  23 +-
 templates.go                                  |   1 -
 14 files changed, 402 insertions(+), 227 deletions(-)
 create mode 100644 cmd/server-manager/typescript/src/Form.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 196febe40..ad0006cc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 v1.7.9
 ------
 
+Added:
+
+* Improved the Track selection dropdowns in all Race Setup pages. You can now see more readable track names, and filter all tracks and layouts.
+
 Fixed:
 
 * Fixes an issue where Live Timings lap counts could reset if a driver does not cleanly disconnect from the Assetto Corsa Server.
diff --git a/cmd/server-manager/typescript/package-lock.json b/cmd/server-manager/typescript/package-lock.json
index 70cbc6e85..0cb6ca3fd 100644
--- a/cmd/server-manager/typescript/package-lock.json
+++ b/cmd/server-manager/typescript/package-lock.json
@@ -464,7 +464,7 @@
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha1-qYP7Gusuw/btBCohD2QOkOeG/g0=",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -482,7 +482,7 @@
     "@babel/plugin-syntax-dynamic-import": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha1-Yr+Ysto80h1iYVT8lu5bPLaOrLM=",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -491,7 +491,7 @@
     "@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha1-AcohtmjNghjJ5kDLbdiMVBKyyWo=",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -500,7 +500,7 @@
     "@babel/plugin-syntax-nullish-coalescing-operator": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha1-Fn7XA2iIYIH3S1w2xlqIwDtm0ak=",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -518,7 +518,7 @@
     "@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha1-YOIl7cvZimQDMqLnLdPmbxr1WHE=",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -527,7 +527,7 @@
     "@babel/plugin-syntax-optional-catch-binding": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha1-YRGiZbz7Ag6579D9/X0mQCue1sE=",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -536,7 +536,7 @@
     "@babel/plugin-syntax-optional-chaining": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha1-T2nCq5UWfgGAzVM2YT+MV4j31Io=",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -1089,7 +1089,7 @@
     "@gulp-sourcemaps/identity-map": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz",
-      "integrity": "sha1-Hm/l2AJ7HyhdwNMXYvVmvM1z1ak=",
+      "integrity": "sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==",
       "dev": true,
       "requires": {
         "acorn": "^5.0.3",
@@ -1108,7 +1108,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "through2": {
@@ -1145,6 +1145,11 @@
         }
       }
     },
+    "@ttskch/select2-bootstrap4-theme": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@ttskch/select2-bootstrap4-theme/-/select2-bootstrap4-theme-1.4.0.tgz",
+      "integrity": "sha512-5WVMdFpQLx0vKxX0/LfapI0aE+qUYOuOuMjOc+ecN8vsr7plcBsgIbp4YtlpLmQR9aqgyM1QyqEiO/FwB+qaqQ=="
+    },
     "@types/bootstrap": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-4.3.1.tgz",
@@ -1157,7 +1162,7 @@
     "@types/bootstrap-switch": {
       "version": "0.0.31",
       "resolved": "https://registry.npmjs.org/@types/bootstrap-switch/-/bootstrap-switch-0.0.31.tgz",
-      "integrity": "sha1-yFtcOyy09sW4hOYZMRicAPuV2DI=",
+      "integrity": "sha512-jEnGdhbb1DZcev3AH4YiI6Kanh61xUmAAat6AEJm/a53MYR0M34fB8WzXEtr3F9RnSG6XDyHSuqrDAZau3EEgg==",
       "requires": {
         "@types/jquery": "*"
       }
@@ -1201,7 +1206,7 @@
     "@types/sizzle": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
-      "integrity": "sha1-qBG4wY4rq6t9VCszZYh64uTZ3kc="
+      "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="
     },
     "@types/summernote": {
       "version": "0.8.1",
@@ -1214,7 +1219,7 @@
     "JSONStream": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha1-MgjB8I06TZkmGrZPkjArwV4RHKA=",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "dev": true,
       "requires": {
         "jsonparse": "^1.2.0",
@@ -1224,7 +1229,7 @@
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
     "accessory": {
@@ -1255,7 +1260,7 @@
     "acorn-node": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha1-EUyV1kU55T3t4j3oudlt98euKvg=",
+      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
       "dev": true,
       "requires": {
         "acorn": "^7.0.0",
@@ -1298,7 +1303,7 @@
     "ansi-colors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha1-Y3S03V1HGP884npnGjscrQdxMqk=",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
         "ansi-wrap": "^0.1.0"
@@ -1365,7 +1370,7 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
       "dev": true
     },
     "archy": {
@@ -1377,7 +1382,7 @@
     "are-we-there-yet": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
       "requires": {
         "delegates": "^1.0.0",
@@ -1405,7 +1410,7 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true
     },
     "arr-map": {
@@ -1453,7 +1458,7 @@
         "is-number": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
           "dev": true
         }
       }
@@ -1461,7 +1466,7 @@
     "array-last": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha1-eqdwc/7FZd2rJJP1+IGF9ASp0zY=",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
       "dev": true,
       "requires": {
         "is-number": "^4.0.0"
@@ -1470,7 +1475,7 @@
         "is-number": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
           "dev": true
         }
       }
@@ -1478,13 +1483,13 @@
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
       "dev": true
     },
     "array-sort": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha1-5MBTVkU/VvU1EqfR1hI/LFTAqIo=",
+      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
       "dev": true,
       "requires": {
         "default-compare": "^1.0.0",
@@ -1495,7 +1500,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
       }
@@ -1514,7 +1519,7 @@
     "asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
       "dev": true,
       "requires": {
         "safer-buffer": "~2.1.0"
@@ -1534,7 +1539,7 @@
     "assert": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha1-VcEJqvbgrv2z3EtxJAxwv1dLGOs=",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
       "dev": true,
       "requires": {
         "object-assign": "^4.1.1",
@@ -1578,7 +1583,7 @@
     "async-done": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha1-XhWqcplipLB0FPUoqIzfGOCykKI=",
+      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
@@ -1622,7 +1627,7 @@
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
     "autoprefixer": {
@@ -1698,7 +1703,7 @@
     "babelify": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz",
-      "integrity": "sha1-/nOxoiWD8GaA2NBy4loeDR0df7U=",
+      "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==",
       "dev": true
     },
     "bach": {
@@ -1726,7 +1731,7 @@
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
         "cache-base": "^1.0.1",
@@ -1750,7 +1755,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -1759,7 +1764,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -1768,7 +1773,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
@@ -1844,7 +1849,7 @@
     "bootstrap": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
-      "integrity": "sha1-KAyo9hBQTZnXtrS/xLaM7GAXBKw="
+      "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
     },
     "bootstrap-switch": {
       "version": "3.3.4",
@@ -1859,7 +1864,7 @@
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -1885,7 +1890,7 @@
     "browser-pack": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
-      "integrity": "sha1-w0uhDQuc4WK1ryJ8cTHJLC7NV3Q=",
+      "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
       "dev": true,
       "requires": {
         "JSONStream": "^1.0.3",
@@ -2005,7 +2010,7 @@
     "browserify-aes": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
         "buffer-xor": "^1.0.3",
@@ -2019,7 +2024,7 @@
     "browserify-cipher": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
       "requires": {
         "browserify-aes": "^1.0.4",
@@ -2030,7 +2035,7 @@
     "browserify-des": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha1-OvTx9Zg5QDVy8cZiBDdfen9wPpw=",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
       "dev": true,
       "requires": {
         "cipher-base": "^1.0.1",
@@ -2080,7 +2085,7 @@
     "browserify-zlib": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
         "pako": "~1.0.5"
@@ -2117,7 +2122,7 @@
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
     "buffer-xor": {
@@ -2135,7 +2140,7 @@
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
         "collection-visit": "^1.0.0",
@@ -2160,7 +2165,7 @@
     "cached-path-relative": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz",
-      "integrity": "sha1-oT30GW0md2IgzDNW6xR6Utuixts=",
+      "integrity": "sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==",
       "dev": true
     },
     "camelcase": {
@@ -2213,7 +2218,7 @@
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
@@ -2223,7 +2228,7 @@
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
@@ -2281,7 +2286,7 @@
     "cloneable-readable": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha1-EgoAywU7+2OiIucJ+Wg+ouEdjOw=",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
@@ -2330,7 +2335,7 @@
     "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "requires": {
         "color-name": "1.1.3"
@@ -2345,7 +2350,7 @@
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha1-k4NDeaHMmgxh+C9S8NBDIiUb1aI="
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
     },
     "combine-source-map": {
       "version": "0.8.0",
@@ -2370,7 +2375,7 @@
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
@@ -2396,7 +2401,7 @@
     "concat-stream": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -2453,7 +2458,7 @@
     "copy-props": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha1-k7scrfr9MdpbuKnUtB9HHsOnLf4=",
+      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
       "dev": true,
       "requires": {
         "each-props": "^1.3.0",
@@ -2496,7 +2501,7 @@
     "create-hash": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
         "cipher-base": "^1.0.1",
@@ -2509,7 +2514,7 @@
     "create-hmac": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
         "cipher-base": "^1.0.3",
@@ -2541,7 +2546,7 @@
     "crypto-browserify": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
         "browserify-cipher": "^1.0.0",
@@ -2560,7 +2565,7 @@
     "css": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha1-xkZ1XHOXHyu6amAeLPL9cbEpiSk=",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
@@ -2572,7 +2577,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
@@ -2603,7 +2608,7 @@
     "dagre": {
       "version": "0.8.5",
       "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.5.tgz",
-      "integrity": "sha1-ujCwBV2sErbB/MJHgXRCd30Gr+4=",
+      "integrity": "sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==",
       "requires": {
         "graphlib": "^2.1.8",
         "lodash": "^4.17.15"
@@ -2619,7 +2624,7 @@
     "dash-ast": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz",
-      "integrity": "sha1-EgKbpfsviqbwqGF5WyPBtLbCfTc=",
+      "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==",
       "dev": true
     },
     "dashdash": {
@@ -2654,7 +2659,7 @@
     "debug-fabulous": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
-      "integrity": "sha1-r4oIYyRlIk70F0qfBjCMPCoevI4=",
+      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
       "dev": true,
       "requires": {
         "debug": "3.X",
@@ -2694,7 +2699,7 @@
     "default-compare": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha1-y2ETGESthNhHiPto/QFoHKd4Gi8=",
+      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
       "dev": true,
       "requires": {
         "kind-of": "^5.0.2"
@@ -2703,7 +2708,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
       }
@@ -2717,7 +2722,7 @@
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "dev": true,
       "requires": {
         "object-keys": "^1.0.12"
@@ -2734,7 +2739,7 @@
     "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
         "is-descriptor": "^1.0.2",
@@ -2744,7 +2749,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -2753,7 +2758,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -2762,7 +2767,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
@@ -2869,7 +2874,7 @@
     "diffie-hellman": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
@@ -2880,7 +2885,7 @@
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
       "dev": true
     },
     "dot-parts": {
@@ -2910,7 +2915,7 @@
     "duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha1-Kk31MX9sz9kfhtb9JdjYoQO4gwk=",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.0.0",
@@ -2922,7 +2927,7 @@
     "each-props": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha1-6kWkFNFt1c+kGbGoFyDVygaJIzM=",
+      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
       "dev": true,
       "requires": {
         "is-plain-object": "^2.0.1",
@@ -2978,7 +2983,7 @@
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
       "requires": {
         "is-arrayish": "^0.2.1"
@@ -3019,7 +3024,7 @@
     "es6-weak-map": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha1-ttofFswswNm+Q+a9v8Xn383zHVM=",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
       "dev": true,
       "requires": {
         "d": "1",
@@ -3084,7 +3089,7 @@
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true
     },
     "event-emitter": {
@@ -3100,13 +3105,13 @@
     "events": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz",
-      "integrity": "sha1-KpoeGOYQbg6BKqnr1KgZs8KcC6U=",
+      "integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==",
       "dev": true
     },
     "evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
         "md5.js": "^1.3.4",
@@ -3156,7 +3161,7 @@
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true
     },
     "extend-shallow": {
@@ -3172,7 +3177,7 @@
         "is-extendable": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
@@ -3198,7 +3203,7 @@
     "fancy-log": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha1-28GRVPVYaQFQojlToK29A1vkX8c=",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
       "requires": {
         "ansi-gray": "^0.1.1",
         "color-support": "^1.1.3",
@@ -3256,7 +3261,7 @@
     "findup-sync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha1-F7EI+e5RLft6XH88iyfqnhqcCNE=",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
       "dev": true,
       "requires": {
         "detect-file": "^1.0.0",
@@ -3559,7 +3564,7 @@
     "fined": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha1-0AvszxqitHXRbUI7Aji3E6LEo3s=",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
       "dev": true,
       "requires": {
         "expand-tilde": "^2.0.2",
@@ -3581,13 +3586,13 @@
     "flagged-respawn": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha1-595vEnnd2cqarIpZcdYYYGs6q0E=",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
       "dev": true
     },
     "flush-write-stream": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha1-jdfYc6G6vCB9lOrQwuDkQnbr8ug=",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
@@ -3618,7 +3623,7 @@
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
@@ -4225,7 +4230,7 @@
     "fstream": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha1-Touo7i1Ivk99DeUFRVVI6uWTIEU=",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -4237,7 +4242,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
     "gauge": {
@@ -4259,7 +4264,7 @@
     "gaze": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
       "dev": true,
       "requires": {
         "globule": "^1.0.0"
@@ -4274,13 +4279,13 @@
     "get-assigned-identifiers": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
-      "integrity": "sha1-bb9BHeZIy6+NkWnrsNLVdhkeL/E=",
+      "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==",
       "dev": true
     },
     "get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o=",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
       "dev": true
     },
     "get-stdin": {
@@ -4748,7 +4753,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -4772,7 +4777,7 @@
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4=",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
     "globo": {
@@ -4800,7 +4805,7 @@
     "glogg": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha1-LX3XAr7aIus7/634gGltpthGMT8=",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
       "requires": {
         "sparkles": "^1.0.0"
       }
@@ -4813,7 +4818,7 @@
     "graphlib": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz",
-      "integrity": "sha1-V2HUFHN4cAhMkux7XbywWSydNdo=",
+      "integrity": "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==",
       "requires": {
         "lodash": "^4.17.15"
       },
@@ -4828,7 +4833,7 @@
     "gulp": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha1-VDZRBw/Q9qsKBlDGo+b/WnywnKo=",
+      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
       "dev": true,
       "requires": {
         "glob-watcher": "^5.0.3",
@@ -4883,7 +4888,7 @@
     "gulp-autoprefixer": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-6.1.0.tgz",
-      "integrity": "sha1-X394Ro/pmlic41P6WJG3vuFrjx4=",
+      "integrity": "sha512-Ti/BUFe+ekhbDJfspZIMiOsOvw51KhI9EncsDfK7NaxjqRm+v4xS9v99kPxEoiDavpWqQWvG8Y6xT1mMlB3aXA==",
       "dev": true,
       "requires": {
         "autoprefixer": "^9.5.1",
@@ -4973,7 +4978,7 @@
     "gulp-sourcemaps": {
       "version": "2.6.5",
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz",
-      "integrity": "sha1-o/AC2HNG0sDzrsNq9+uHPyPeiuY=",
+      "integrity": "sha512-SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg==",
       "dev": true,
       "requires": {
         "@gulp-sourcemaps/identity-map": "1.X",
@@ -4998,7 +5003,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "through2": {
@@ -5016,7 +5021,7 @@
     "gulp-typescript": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.1.tgz",
-      "integrity": "sha1-lsZWWm6zHgjCquHIV7GgeeYibZQ=",
+      "integrity": "sha512-YuMMlylyJtUSHG1/wuSVTrZp60k1dMEFKYOvDf7OvbAJWrDtxxD4oZon4ancdWwzjj30ztiidhe4VXJniF0pIQ==",
       "dev": true,
       "requires": {
         "ansi-colors": "^3.0.5",
@@ -5030,13 +5035,13 @@
         "ansi-colors": {
           "version": "3.2.4",
           "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-          "integrity": "sha1-46PaS/uubIapwoViXeEkojQCb78=",
+          "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
           "dev": true
         },
         "source-map": {
           "version": "0.7.3",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
         },
         "through2": {
@@ -5053,7 +5058,7 @@
     "gulp-uglify-es": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/gulp-uglify-es/-/gulp-uglify-es-1.0.4.tgz",
-      "integrity": "sha1-We4NXqmMHgnG6qWMiwGKatM/SNQ=",
+      "integrity": "sha512-UMRufZsBmQizCYpftutaiVoLswpbzFEfY90EJLU4YlTgculeHnanb794s88TMd5tpCZVC638sAX6JrLVYTP/Wg==",
       "dev": true,
       "requires": {
         "o-stream": "^0.2.2",
@@ -5159,7 +5164,7 @@
     "gulp-watch": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/gulp-watch/-/gulp-watch-5.0.1.tgz",
-      "integrity": "sha1-g9N4dS9b+0baAj5zwX7R2nBmIV0=",
+      "integrity": "sha512-HnTSBdzAOFIT4wmXYPDUn783TaYAq9bpaN05vuZNP5eni3z3aRx0NAKbjhhMYtcq76x4R1wf4oORDGdlrEjuog==",
       "dev": true,
       "requires": {
         "ansi-colors": "1.1.0",
@@ -5575,7 +5580,7 @@
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
@@ -5697,7 +5702,7 @@
     "hash.js": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha1-C6vKU46NTuSg+JiNaIZlN6ADz0I=",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
@@ -5718,7 +5723,7 @@
     "homedir-polyfill": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha1-dDKYzvTlrz4ZQWH7rcwhUdOgWOg=",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
       "dev": true,
       "requires": {
         "parse-passwd": "^1.0.0"
@@ -5791,7 +5796,7 @@
     "ini": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
       "dev": true
     },
     "inline-source-map": {
@@ -5857,7 +5862,7 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
       "dev": true,
       "requires": {
         "is-relative": "^1.0.0",
@@ -5891,7 +5896,7 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
     "is-data-descriptor": {
@@ -5912,7 +5917,7 @@
     "is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
         "is-accessor-descriptor": "^0.1.6",
@@ -5923,7 +5928,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
       }
@@ -6000,7 +6005,7 @@
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "requires": {
         "isobject": "^3.0.1"
@@ -6035,7 +6040,7 @@
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
       "dev": true,
       "requires": {
         "is-unc-path": "^1.0.0"
@@ -6050,7 +6055,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
       "dev": true,
       "requires": {
         "unc-path-regex": "^0.1.2"
@@ -6071,7 +6076,7 @@
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true
     },
     "isarray": {
@@ -6108,7 +6113,7 @@
     "jquery.quicksearch": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/jquery.quicksearch/-/jquery.quicksearch-2.4.0.tgz",
-      "integrity": "sha1-JAyfQ16TbGO/j7ujVRRP/d356iY=",
+      "integrity": "sha512-20FJSCW3kTawO6Jvy/6MtUCURvgUZFqRUOAGTxH/VaPlwLG4kba82sKaM3ghTi1DsmSZrM2BvrwLUwNWmwDXiw==",
       "requires": {
         "jquery": ">=1.8"
       }
@@ -6122,7 +6127,7 @@
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk=",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
     "jsbn": {
@@ -6134,7 +6139,7 @@
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q=",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
     "json-schema": {
@@ -6146,7 +6151,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
     "json-stable-stringify": {
@@ -6250,7 +6255,7 @@
     "labeled-stream-splicer": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
-      "integrity": "sha1-QqQaFqvNRv0EYwbPTyw1dv/7HCE=",
+      "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
@@ -6312,7 +6317,7 @@
     "liftoff": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha1-ybpggfkIZwYH7nkGLXAN8GLFLtM=",
+      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
       "dev": true,
       "requires": {
         "extend": "^3.0.0",
@@ -6535,7 +6540,7 @@
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
@@ -6897,13 +6902,13 @@
     "math-random": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-      "integrity": "sha1-XdaUPJOFSCZwFtTjTwV1gwgMUUw=",
+      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
       "dev": true
     },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha1-tdB7jjIW4+J81yjXL3DR5qNCAF8=",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dev": true,
       "requires": {
         "hash-base": "^3.0.0",
@@ -6914,7 +6919,7 @@
     "memoizee": {
       "version": "0.4.14",
       "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
-      "integrity": "sha1-B6APIEaZ+alcLZ53IYJxx81hDVc=",
+      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
       "dev": true,
       "requires": {
         "d": "1",
@@ -6977,7 +6982,7 @@
     "miller-rabin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
         "bn.js": "^4.0.0",
@@ -7002,7 +7007,7 @@
     "minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc=",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
       "dev": true
     },
     "minimalistic-crypto-utils": {
@@ -7014,7 +7019,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -7028,7 +7033,7 @@
     "mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha1-ESC0PcNZp4Xc5ltVuC4lfM9HlWY=",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -7038,7 +7043,7 @@
         "is-extendable": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
@@ -7194,7 +7199,7 @@
     "mute-stdout": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-      "integrity": "sha1-rLAwDrTeI6fd7sAU4+lgRLNHIzE=",
+      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
       "dev": true
     },
     "nan": {
@@ -7207,7 +7212,7 @@
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
       "requires": {
         "arr-diff": "^4.0.0",
@@ -7252,7 +7257,7 @@
     "node-gyp": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-      "integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=",
+      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
       "dev": true,
       "requires": {
         "fstream": "^1.0.0",
@@ -7565,7 +7570,7 @@
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
@@ -7603,7 +7608,7 @@
     "now-and-later": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-      "integrity": "sha1-jlechoV2SnzALLaAOA6U9DzLH3w=",
+      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
       "dev": true,
       "requires": {
         "once": "^1.3.2"
@@ -7612,7 +7617,7 @@
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
       "requires": {
         "are-we-there-yet": "~1.1.2",
@@ -7636,13 +7641,13 @@
     "o-stream": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/o-stream/-/o-stream-0.2.2.tgz",
-      "integrity": "sha1-f+A6+HC4+VN68zsxKzgbMDSrQQ8=",
+      "integrity": "sha512-V3j76KU3g/Gyl8rpdi2z72rn5zguMvTCQgAXfBe3pxEefKqXmOUOD7mvx/mNjykdxGqDVfpSoo8r+WdrkWg/1Q==",
       "dev": true
     },
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
       "dev": true
     },
     "object-assign": {
@@ -7861,7 +7866,7 @@
     "osenv": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
       "requires": {
         "os-homedir": "^1.0.0",
@@ -7956,7 +7961,7 @@
     "parse-node-version": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha1-4rXb7eAOf6m8NjYH9TMn6LBzGJs="
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="
     },
     "parse-passwd": {
       "version": "1.0.0",
@@ -7979,7 +7984,7 @@
     "path-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha1-5sTd1+06onxoogzE5Q4aTug7vEo=",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
       "dev": true
     },
     "path-dirname": {
@@ -8005,7 +8010,7 @@
     "path-parse": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
     "path-platform": {
@@ -8103,7 +8108,7 @@
     "plugin-error": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha1-dwFr2JGdCsN3/c3QMiMolTyleBw=",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
       "dev": true,
       "requires": {
         "ansi-colors": "^1.0.1",
@@ -8209,7 +8214,7 @@
     "public-encrypt": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha1-T8ydd6B+SLp1J+fL4N4z0HATMeA=",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
       "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
@@ -8223,7 +8228,7 @@
     "pump": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
@@ -8233,7 +8238,7 @@
     "pumpify": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
       "dev": true,
       "requires": {
         "duplexify": "^3.6.0",
@@ -8250,7 +8255,7 @@
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
       "dev": true
     },
     "querystring": {
@@ -8268,7 +8273,7 @@
     "randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-      "integrity": "sha1-t3bvxZN1mE42xTey9RofCv8Noe0=",
+      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
       "requires": {
         "is-number": "^4.0.0",
@@ -8279,7 +8284,7 @@
         "is-number": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
           "dev": true
         },
         "kind-of": {
@@ -8293,7 +8298,7 @@
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo=",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
       "requires": {
         "safe-buffer": "^5.1.0"
@@ -8302,12 +8307,12 @@
     "randomcolor": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/randomcolor/-/randomcolor-0.5.4.tgz",
-      "integrity": "sha1-32FbE/JbiepYxfj3JkfwpvB63MM="
+      "integrity": "sha512-nYd4nmTuuwMFzHL6W+UWR5fNERGZeVauho8mrJDUSXdNDbao4rbrUwhuLgKC/j8VCS5+34Ria8CsTDuBjrIrQA=="
     },
     "randomfill": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
       "requires": {
         "randombytes": "^2.0.5",
@@ -8361,7 +8366,7 @@
     "readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.11",
@@ -8714,7 +8719,7 @@
     "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
         "is-equal-shallow": "^0.1.3"
@@ -8723,7 +8728,7 @@
     "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.2",
@@ -8770,7 +8775,7 @@
     "remove-bom-buffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-      "integrity": "sha1-wr8eN3Ug0yT2I4kuM8EMrCwlK1M=",
+      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
       "dev": true,
       "requires": {
         "is-buffer": "^1.1.5",
@@ -8830,7 +8835,7 @@
     "repeat-element": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha1-eC4NglwMWjuzlzH4Tv7mt0Lmsc4=",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
       "dev": true
     },
     "repeat-string": {
@@ -8951,7 +8956,7 @@
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
     "rimraf": {
@@ -8965,7 +8970,7 @@
     "ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "requires": {
         "hash-base": "^3.0.0",
@@ -8984,7 +8989,7 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -8998,7 +9003,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true
     },
     "scss-tokenizer": {
@@ -9022,6 +9027,11 @@
         }
       }
     },
+    "select2": {
+      "version": "4.0.13",
+      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz",
+      "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="
+    },
     "semver": {
       "version": "5.7.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
@@ -9069,7 +9079,7 @@
     "sha.js": {
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
@@ -9089,7 +9099,7 @@
     "shell-quote": {
       "version": "1.7.2",
       "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha1-Z6fQLHbJ2iT5nSCAj8re0ODgS+I=",
+      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
       "dev": true
     },
     "signal-exit": {
@@ -9113,7 +9123,7 @@
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
         "base": "^0.11.1",
@@ -9149,7 +9159,7 @@
     "snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "requires": {
         "define-property": "^1.0.0",
@@ -9169,7 +9179,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -9178,7 +9188,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -9187,7 +9197,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
@@ -9212,7 +9222,7 @@
     "snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
         "kind-of": "^3.2.0"
@@ -9264,7 +9274,7 @@
     "sparkles": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha1-AI22XtzmxQ7sDF4ijhlFBh3QQ3w="
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="
     },
     "spdx-correct": {
       "version": "3.1.0",
@@ -9301,7 +9311,7 @@
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.0"
@@ -9310,7 +9320,7 @@
     "sshpk": {
       "version": "1.16.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha1-+2YcC+8ps520B2nuOfpwCT1vaHc=",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "dev": true,
       "requires": {
         "asn1": "~0.2.3",
@@ -9354,7 +9364,7 @@
     "stdout-stream": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-      "integrity": "sha1-WsF0zdXNcmEEqgwLK9g4FdjVNd4=",
+      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
       "dev": true,
       "requires": {
         "readable-stream": "^2.0.1"
@@ -9363,7 +9373,7 @@
     "stream-browserify": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha1-h1IdOKRKp+6RzhzSpH3wy0ndZgs=",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
       "dev": true,
       "requires": {
         "inherits": "~2.0.1",
@@ -9383,7 +9393,7 @@
     "stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha1-rNrI2lnvK8HheiwMz2wyDRIOVV0=",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
       "dev": true
     },
     "stream-http": {
@@ -9420,7 +9430,7 @@
     "stream-splicer": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz",
-      "integrity": "sha1-CxO37itax+BgmnRj2DiZWJo2P80=",
+      "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
@@ -9541,7 +9551,7 @@
     "syntax-error": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
-      "integrity": "sha1-LZ1P9cBkrLcRWUo+O5UFStUdkHw=",
+      "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
       "dev": true,
       "requires": {
         "acorn-node": "^1.2.0"
@@ -9550,7 +9560,7 @@
     "tar": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-      "integrity": "sha1-DKiEhWLHKZuLRG/2pNYM27I+3EA=",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "dev": true,
       "requires": {
         "block-stream": "*",
@@ -9567,7 +9577,7 @@
     "terser": {
       "version": "3.17.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
-      "integrity": "sha1-+I/77aDetWN/nSSw2mb04VqxDLI=",
+      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
       "dev": true,
       "requires": {
         "commander": "^2.19.0",
@@ -9578,7 +9588,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
@@ -9637,7 +9647,7 @@
     "through2-filter": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-      "integrity": "sha1-cA54bfI2fCyIzYqlvkz5weeDElQ=",
+      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
       "dev": true,
       "requires": {
         "through2": "~2.0.0",
@@ -9678,7 +9688,7 @@
     "timers-ext": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha1-b1ethXjgej+5+R2Th9ZWR1VeJcY=",
+      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
       "dev": true,
       "requires": {
         "es5-ext": "~0.10.46",
@@ -9713,7 +9723,7 @@
     "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
         "define-property": "^2.0.2",
@@ -9818,7 +9828,7 @@
     "true-case-path": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha1-+BO1qMhrQNpZYGcisUTjIleZ9H0=",
+      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
       "dev": true,
       "requires": {
         "glob": "^7.1.2"
@@ -9870,7 +9880,7 @@
     "tty-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
-      "integrity": "sha1-PwUlHuF5BN/QZ3VGZw25ZRaCuBE=",
+      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
       "dev": true
     },
     "tunnel-agent": {
@@ -9897,13 +9907,13 @@
     "typescript": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.2.tgz",
-      "integrity": "sha1-EFsPGTQRnd5UOsjrca86kQCe/lQ=",
+      "integrity": "sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==",
       "dev": true
     },
     "umd": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
-      "integrity": "sha1-qp/mU8QrkJdnhInAEACstp8LJs8=",
+      "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
       "dev": true
     },
     "unc-path-regex": {
@@ -9915,7 +9925,7 @@
     "undeclared-identifiers": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz",
-      "integrity": "sha1-klTB03vawKwrUt5LZyJ5LSqR4w8=",
+      "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==",
       "dev": true,
       "requires": {
         "acorn-node": "^1.3.0",
@@ -9951,13 +9961,13 @@
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha1-JhmADEyCWADv3YNDr33Zkzy+KBg=",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
       "dev": true
     },
     "unicode-match-property-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha1-jtKjJWmWG86SJ9Cc0/+7j+1fAgw=",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
       "dev": true,
       "requires": {
         "unicode-canonical-property-names-ecmascript": "^1.0.4",
@@ -10014,7 +10024,7 @@
     "unique-stream": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-      "integrity": "sha1-xl0RDppK35psWUiygFPZqNBMvqw=",
+      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
       "dev": true,
       "requires": {
         "json-stable-stringify-without-jsonify": "^1.0.1",
@@ -10117,13 +10127,13 @@
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha1-1QyMrHmhn7wg8pEfVuuXP04QBw8=",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
     "util": {
       "version": "0.10.4",
       "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha1-OqASW/5mikZy3liFfTrOJ+y3aQE=",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
       "dev": true,
       "requires": {
         "inherits": "2.0.3"
@@ -10143,7 +10153,7 @@
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha1-/JH2uce6FchX9MssXe/uw51PQQo=",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
       "requires": {
         "spdx-correct": "^3.0.0",
@@ -10251,7 +10261,7 @@
     "vinyl-fs": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha1-yFhJQF9nQo/qu71cXb3WT0fTG8c=",
+      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
       "dev": true,
       "requires": {
         "fs-mkdirp-stream": "^1.0.0",
@@ -10340,7 +10350,7 @@
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "requires": {
         "isexe": "^2.0.0"
@@ -10355,7 +10365,7 @@
     "wide-align": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
       "requires": {
         "string-width": "^1.0.2 || 2"
diff --git a/cmd/server-manager/typescript/package.json b/cmd/server-manager/typescript/package.json
index d6dc86d6f..e882a0de5 100644
--- a/cmd/server-manager/typescript/package.json
+++ b/cmd/server-manager/typescript/package.json
@@ -43,7 +43,9 @@
     "randomcolor": "^0.5.4",
     "reconnecting-websocket": "^4.2.0",
     "rrule": "^2.6.4",
-    "summernote": "^0.8.15"
+    "summernote": "^0.8.15",
+    "select2": "^4.0.13",
+    "@ttskch/select2-bootstrap4-theme": "^1.4.0"
   },
   "devDependencies": {
     "@babel/core": "^7.10",
diff --git a/cmd/server-manager/typescript/sass/_imports.scss b/cmd/server-manager/typescript/sass/_imports.scss
index 6d6593133..84a002945 100644
--- a/cmd/server-manager/typescript/sass/_imports.scss
+++ b/cmd/server-manager/typescript/sass/_imports.scss
@@ -6,6 +6,9 @@
 @import "bootstrap-switch/dist/css/bootstrap3/bootstrap-switch";
 @import "multiselect/css/multi-select";
 @import "summernote/dist/summernote-bs4";
+@import "select2/dist/css/select2";
+@import "@ttskch/select2-bootstrap4-theme/dist/select2-bootstrap4";
+
 
 // app
 @import "layout";
diff --git a/cmd/server-manager/typescript/sass/_layout.scss b/cmd/server-manager/typescript/sass/_layout.scss
index 17ff346c2..2799a330d 100644
--- a/cmd/server-manager/typescript/sass/_layout.scss
+++ b/cmd/server-manager/typescript/sass/_layout.scss
@@ -156,4 +156,20 @@ footer a {
     max-height: 85vh;
     align-items: start;
   }
-}
\ No newline at end of file
+}
+
+.select2-selection {
+  box-shadow: $input-box-shadow;
+}
+
+.select2, .select2-container {
+  font-size: 14px;
+}
+
+.entrant .select2 {
+  font-size: 12px;
+}
+
+.select2-dropdown {
+  z-index: 999;
+}
diff --git a/cmd/server-manager/typescript/src/Form.ts b/cmd/server-manager/typescript/src/Form.ts
new file mode 100644
index 000000000..dfbf320cf
--- /dev/null
+++ b/cmd/server-manager/typescript/src/Form.ts
@@ -0,0 +1,38 @@
+import select2 from "select2";
+
+export class Form {
+    public constructor() {
+        this.initSelect2();
+    }
+
+    private initSelect2() {
+        // initialise select2 using its own batshit loader.
+        select2($);
+    }
+
+    public static initialiseSelect2InElement($elem: JQuery<Document | HTMLElement>) {
+        Form.initialiseSelect2OnElement($elem.find("select:not([multiple])"));
+    }
+
+    public static initialiseSelect2OnElement($elem) {
+        $elem.select2({
+            theme: "bootstrap4",
+            templateResult: (data) => {
+                let $elem = $(data.element);
+
+                let trackName = $elem.data("track-name");
+
+                if (!trackName) {
+                    return data.text;
+                }
+
+                let $opt = $("<span>");
+                $opt.text($elem.text());
+                $opt.append($("<small class='float-right text-muted'>" + trackName + "</small>"));
+                $opt.append($("<div class='clearfix'></div>"));
+
+                return $opt;
+            },
+        });
+    }
+}
diff --git a/cmd/server-manager/typescript/src/javascript/manager.js b/cmd/server-manager/typescript/src/javascript/manager.js
index 41baa4983..17fa38634 100644
--- a/cmd/server-manager/typescript/src/javascript/manager.js
+++ b/cmd/server-manager/typescript/src/javascript/manager.js
@@ -1,13 +1,14 @@
 "use strict";
 
 import {CarSearch} from "../CarSearch";
+import {Form} from "../Form";
 
 let $document;
 
 let moment = require("moment");
 
 // entry-point
-$(document).ready(function () {
+export function EntryPoint() {
     console.log("initialising server manager javascript");
 
     $document = $(document);
@@ -156,7 +157,7 @@ $(document).ready(function () {
             $document.find("#save-race-button").val("justSave");
         }
     });
-});
+}
 
 const nameRegex = /^[A-Za-z]{0,5}[0-9]+/;
 
@@ -285,10 +286,10 @@ class RaceSetup {
                 let trackLayout = $optValSplit[1];
 
                 if (!that.trackLayoutOpts[trackName]) {
-                    that.trackLayoutOpts[trackName] = [];
+                    that.trackLayoutOpts[trackName] = {};
                 }
 
-                that.trackLayoutOpts[trackName].push(trackLayout);
+                that.trackLayoutOpts[trackName][trackLayout] = $(opt).text();
 
                 if ($optValSplit.length > 2) {
                     that.currentLayout = trackLayout;
@@ -296,11 +297,14 @@ class RaceSetup {
             });
 
             that.$trackLayoutDropdownParent.hide();
+
+            Form.initialiseSelect2OnElement(that.$trackDropdown);
+            Form.initialiseSelect2OnElement(that.$trackLayoutDropdown);
+
             that.loadTrackLayouts();
 
             that.$trackDropdown.change(that.loadTrackLayouts.bind(this));
             that.$trackLayoutDropdown.change(that.showTrackDetails.bind(this));
-
         }
 
         this.raceLaps();
@@ -757,10 +761,9 @@ class RaceSetup {
                 $maxClients.attr("max", overrideAmount);
                 $maxClients.val(overrideAmount);
             }
-        })
-            .fail(function () {
-                $pitBoxes.closest(".row").hide()
-            })
+        }).fail(function () {
+            $pitBoxes.closest(".row").hide()
+        });
     }
 
     /**
@@ -772,10 +775,11 @@ class RaceSetup {
 
         let selectedTrack = this.$trackDropdown.find("option:selected").val();
         let availableLayouts = this.trackLayoutOpts[selectedTrack];
+        let availableLayoutKeys = Object.keys(availableLayouts);
 
-        if (availableLayouts && !(availableLayouts.length === 1 && availableLayouts[0] === "<default>")) {
-            for (let i = 0; i < availableLayouts.length; i++) {
-                this.$trackLayoutDropdown.append(this.buildTrackLayoutOption(availableLayouts[i]));
+        if (availableLayouts && !(availableLayoutKeys.length === 1 && availableLayoutKeys[0] === "<default>")) {
+            for (const [layout, name] of Object.entries(availableLayouts)) {
+                this.$trackLayoutDropdown.append(this.buildTrackLayoutOption(layout, name));
             }
 
             this.$trackLayoutDropdownParent.show();
@@ -785,6 +789,7 @@ class RaceSetup {
             this.$trackLayoutDropdownParent.hide();
         }
 
+        Form.initialiseSelect2OnElement(this.$trackLayoutDropdown);
 
         this.showTrackDetails();
     }
@@ -794,10 +799,11 @@ class RaceSetup {
      * @param layout
      * @returns {HTMLElement}
      */
-    buildTrackLayoutOption(layout) {
+    buildTrackLayoutOption(layout, name) {
         let $opt = $("<option/>");
         $opt.attr({'value': layout});
-        $opt.text(prettifyName(layout, true));
+        $opt.text(name);
+        $opt.data("track-name", layout);
 
         if (layout === this.currentLayout) {
             $opt.prop("selected", true);
diff --git a/cmd/server-manager/typescript/src/main.ts b/cmd/server-manager/typescript/src/main.ts
index 9121d107f..0c5aafcfe 100644
--- a/cmd/server-manager/typescript/src/main.ts
+++ b/cmd/server-manager/typescript/src/main.ts
@@ -5,7 +5,7 @@ import "summernote/dist/summernote-bs4";
 import "multiselect";
 import "moment";
 import "moment-timezone";
-import "./javascript/manager.js";
+import {EntryPoint} from "./javascript/manager";
 import "./Font";
 import "./Calendar";
 
@@ -22,8 +22,11 @@ import {Championship} from "./Championship";
 import {Results} from "./Results";
 import {RaceList} from "./RaceList";
 import {SpectatorCar} from "./SpectatorCar";
+import {Form} from "./Form";
 
 $(() => {
+    new Form();
+    EntryPoint();
     new RaceControl();
     new CarDetail();
     new TrackDetail();
@@ -46,5 +49,6 @@ $(() => {
 declare global {
     interface JQuery {
         multiSelect: any;
+        select2: any;
     }
 }
diff --git a/cmd/server-manager/views/pages/custom-race/new.html b/cmd/server-manager/views/pages/custom-race/new.html
index 084948c59..634ab0ca4 100644
--- a/cmd/server-manager/views/pages/custom-race/new.html
+++ b/cmd/server-manager/views/pages/custom-race/new.html
@@ -10,6 +10,19 @@
     {{ end }}
 {{ end }}
 
+{{ define "track-options" }}
+    {{ $tracks := .Tracks }}
+    {{ $selectedTrack := .SelectedTrack }}
+
+    {{ range $index, $track := $tracks }}
+        <option value="{{ $track.Name }}" {{ if eq $track.Name $selectedTrack }}selected="selected" {{ end }}
+                data-track-name="{{ $track.Name }}"
+        >
+            {{ $track.PrettyName }}
+        </option>
+    {{ end }}
+{{ end }}
+
 {{ define "content" }}
     {{ $f := .Current }}
     {{ $trackInfo := trackInfo $f.Track $f.TrackLayout }}
@@ -68,18 +81,27 @@ <h1 class="text-center">
 
                             <div class="col-sm-9">
                                 <select class="form-control" name="Track" id="Track">
-                                    {{ range $index, $track := .TrackOpts }}
-                                        <option value="{{ $track.Name }}" {{ if eq $track.Name $f.Track }}selected="selected" {{ end }}
-                                                class="{{ if $track.IsPaidDLC }}bg-dlc{{ end }}{{ if $track.IsMod }}bg-mod{{ end }}">
-                                            {{ prettify $track.Name false }}
-                                        </option>
+                                    {{ $split := .TrackOpts.Split }}
+
+
+                                    {{ with $split.Stock }}
+                                        <optgroup label="Stock">
+                                            {{ template "track-options" dict "Tracks" . "SelectedTrack" $f.Track }}
+                                        </optgroup>
                                     {{ end }}
-                                </select>
 
-                                <small style="cursor: default;">
-                                    <span class="badge bg-dlc">DLC</span>
-                                    <span class="badge bg-mod">Mod</span>
-                                </small>
+                                    {{ with $split.DLC }}
+                                        <optgroup label="DLC">
+                                            {{ template "track-options" dict "Tracks" . "SelectedTrack" $f.Track }}
+                                        </optgroup>
+                                    {{ end }}
+
+                                    {{ with $split.Mod }}
+                                        <optgroup label="Mod">
+                                            {{ template "track-options" dict "Tracks" . "SelectedTrack" $f.Track }}
+                                        </optgroup>
+                                    {{ end }}
+                                </select>
                             </div>
                         </div>
 
@@ -93,10 +115,17 @@ <h1 class="text-center">
                                 <select class="form-control" name="TrackLayout" id="TrackLayout">
                                     {{ range $index, $track := .TrackOpts }}
                                         {{ range $layoutIndex, $layout := $track.Layouts }}
+                                            {{ $name := $layout }}
+                                            {{ $trackInfo := trackInfo $track.Name $layout }}
+
+                                            {{ with $trackInfo }}
+                                                {{ $name = $trackInfo.Name }}
+                                            {{ end }}
+
                                             {{ if and (eq $track.Name $f.Track) (eq $layout $f.TrackLayout) }}
-                                                <option value="{{ $track.Name }}:{{ $layout }}:current">{{ $layout }}</option>
+                                                <option value="{{ $track.Name }}:{{ $layout }}:current" data-track-name="{{ $layout }}">{{ $name }}</option>
                                             {{ else }}
-                                                <option value="{{ $track.Name }}:{{ $layout }}">{{ $layout }}</option>
+                                                <option value="{{ $track.Name }}:{{ $layout }}" data-track-name="{{ $layout }}">{{ $name }}</option>
                                             {{ end }}
                                         {{ end }}
                                     {{ end }}
diff --git a/content_tracks.go b/content_tracks.go
index 7870fd4ca..c31a0dfef 100644
--- a/content_tracks.go
+++ b/content_tracks.go
@@ -15,12 +15,14 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"unicode"
 
 	"github.com/JustaPenguin/assetto-server-manager/cmd/server-manager/static"
 
 	"github.com/cj123/ini"
 	"github.com/dimchansky/utfbom"
 	"github.com/go-chi/chi"
+	"github.com/jpillora/longestcommon"
 	"github.com/nfnt/resize"
 	"github.com/sirupsen/logrus"
 )
@@ -29,6 +31,8 @@ type Track struct {
 	Name    string
 	Layouts []string
 
+	CalculatedPrettyName string
+
 	MetaData TrackMetaData
 }
 
@@ -87,6 +91,10 @@ func (t *Track) LoadMetaData() error {
 }
 
 func (t Track) PrettyName() string {
+	if t.CalculatedPrettyName != "" {
+		return t.CalculatedPrettyName
+	}
+
 	return prettifyName(t.Name, false)
 }
 
@@ -574,7 +582,39 @@ func (tm *TrackManager) GetTrackFromName(name string) (*Track, error) {
 		}
 	}
 
-	return &Track{Name: name, Layouts: layouts}, nil
+	track := &Track{Name: name, Layouts: layouts}
+
+	var layoutNames []string
+
+	for _, layout := range layouts {
+		info := trackInfo(track.Name, layout)
+
+		if info == nil {
+			continue
+		}
+
+		layoutNames = append(layoutNames, info.Name)
+	}
+
+	if len(layoutNames) > 0 {
+		if len(layoutNames) == 1 {
+			track.CalculatedPrettyName = strings.Title(layoutNames[0])
+		} else {
+			sort.Slice(layoutNames, func(i, j int) bool {
+				return len(layoutNames[i]) < len(layoutNames[j])
+			})
+
+			commonPrefix := strings.TrimRightFunc(longestcommon.Prefix(layoutNames), func(r rune) bool {
+				return !unicode.IsLetter(r) && !unicode.IsNumber(r) && r != ']' && r != ')' && r != '}'
+			})
+
+			if commonPrefix != "" {
+				track.CalculatedPrettyName = strings.Title(commonPrefix)
+			}
+		}
+	}
+
+	return track, nil
 }
 
 func (tm *TrackManager) UpdateTrackMetadata(name string, r *http.Request) error {
diff --git a/go.mod b/go.mod
index 05804a7b4..1bbde9dce 100644
--- a/go.mod
+++ b/go.mod
@@ -44,6 +44,7 @@ require (
 	github.com/imdario/mergo v0.3.8 // indirect
 	github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43
 	github.com/jmhodges/levigo v1.0.0 // indirect
+	github.com/jpillora/longestcommon v0.0.0-20161227235612-adb9d91ee629
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/lorenzosaino/go-sysctl v0.1.0
 	github.com/mattn/go-colorable v0.1.4 // indirect
diff --git a/go.sum b/go.sum
index f18bb7450..5facb1ce8 100644
--- a/go.sum
+++ b/go.sum
@@ -147,6 +147,8 @@ github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43 h1:jTkyeF7NZ5o
 github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
 github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U=
 github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ=
+github.com/jpillora/longestcommon v0.0.0-20161227235612-adb9d91ee629 h1:1dSBUfGlorLAua2CRx0zFN7kQsTpE2DQSmr7rrTNgY8=
+github.com/jpillora/longestcommon v0.0.0-20161227235612-adb9d91ee629/go.mod h1:mb5nS4uRANwOJSZj8rlCWAfAcGi72GGMIXx+xGOjA7M=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
diff --git a/race_manager.go b/race_manager.go
index f689c15ab..388778c36 100644
--- a/race_manager.go
+++ b/race_manager.go
@@ -936,11 +936,32 @@ func (rm *RaceManager) ListAutoFillEntrants() ([]*Entrant, error) {
 	return entrants, nil
 }
 
+type TrackOptsGrouped []Track
+
+type TracksSplit struct {
+	Stock, DLC, Mod []Track
+}
+
+func (tog TrackOptsGrouped) Split() TracksSplit {
+	var split TracksSplit
+	for _, t := range tog {
+		if t.IsMod() {
+			split.Mod = append(split.Mod, t)
+		} else if t.IsPaidDLC() {
+			split.DLC = append(split.DLC, t)
+		} else {
+			split.Stock = append(split.Stock, t)
+		}
+	}
+
+	return split
+}
+
 type RaceTemplateVars struct {
 	BaseTemplateVars
 
 	CarOpts             Cars
-	TrackOpts           []Track
+	TrackOpts           TrackOptsGrouped
 	AvailableSessions   []SessionType
 	Weather             Weather
 	SolIsInstalled      bool
diff --git a/templates.go b/templates.go
index dfef9bc19..35eb336ea 100644
--- a/templates.go
+++ b/templates.go
@@ -415,7 +415,6 @@ func trackInfo(track, layout string) *TrackInfo {
 	t, err := GetTrackInfo(track, layout)
 
 	if err != nil {
-		logrus.WithError(err).Errorf("Could not get track info for %s (%s)", track, layout)
 		return nil
 	}
 

From 33e987c69838bd5b8e31e754119496816202a207 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Mon, 30 Nov 2020 20:17:37 +0000
Subject: [PATCH 14/25] add missing param

---
 cmd/server-manager/typescript/src/javascript/manager.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmd/server-manager/typescript/src/javascript/manager.js b/cmd/server-manager/typescript/src/javascript/manager.js
index 17fa38634..60571570c 100644
--- a/cmd/server-manager/typescript/src/javascript/manager.js
+++ b/cmd/server-manager/typescript/src/javascript/manager.js
@@ -785,7 +785,7 @@ class RaceSetup {
             this.$trackLayoutDropdownParent.show();
         } else {
             // add an option with an empty value
-            this.$trackLayoutDropdown.append(this.buildTrackLayoutOption(""));
+            this.$trackLayoutDropdown.append(this.buildTrackLayoutOption("", ""));
             this.$trackLayoutDropdownParent.hide();
         }
 
@@ -797,6 +797,7 @@ class RaceSetup {
     /**
      * buildTrackLayoutOption: builds an <option> containing track layout information
      * @param layout
+     * @param name
      * @returns {HTMLElement}
      */
     buildTrackLayoutOption(layout, name) {

From a5ea9309516002d1643ac7141abdbc3008cf81bf Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Tue, 1 Dec 2020 10:11:42 +0000
Subject: [PATCH 15/25] add dark mode styles for track select

---
 .../typescript/sass/server-manager-dark.scss    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/cmd/server-manager/typescript/sass/server-manager-dark.scss b/cmd/server-manager/typescript/sass/server-manager-dark.scss
index 399f3f4bc..39f5646b7 100644
--- a/cmd/server-manager/typescript/sass/server-manager-dark.scss
+++ b/cmd/server-manager/typescript/sass/server-manager-dark.scss
@@ -158,11 +158,23 @@ $pre-color:                         inherit;
   color: $white !important;
 }
 
-.form-control, .ms-selectable, .ms-selection, .ms-container *:not(.ms-hover):not(span):not(.bg-mod):not(.bg-dlc) {
+.form-control, .ms-selectable, .ms-selection, .ms-container *:not(.ms-hover):not(span):not(.bg-mod):not(.bg-dlc), .select2-selection, .select2-dropdown, .select2-dropdown input.select2-search__field {
   background: $gray-700 !important;
   color: $white !important;
 }
 
+.select2-dropdown .select2-results__option[aria-selected="true"] {
+  color: $black;
+}
+
+.select2-selection__arrow b {
+  border-color: $white transparent transparent transparent !important;
+}
+
+strong.select2-results__group {
+  color: $white !important;
+}
+
 .bg-secondary {
   color: $black !important;
 }
@@ -199,4 +211,5 @@ svg path.race-weekend-arrow {
 
 .table-secondary {
   color: $black !important;
-}
\ No newline at end of file
+}
+

From 555026b520248dbae1eea864378f800fa1ccc4dd Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Tue, 1 Dec 2020 12:21:17 +0000
Subject: [PATCH 16/25] don't error on udp listener close

---
 CHANGELOG.md      |  1 +
 server_process.go | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad0006cc1..e8db09b3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ Fixed:
 * Fixes an issue where multiservers could omit scanning new cars if they were added in groups, rather than one at once. If your server is missing cars in the car list, please "Rebuild Search Index" on the Server Options page!
 * Fixes an issue where track names would not update when a track was reuploaded.
 * Fixes an issue where pitboxes could not be loaded for a track with an invalid JSON file.
+* Improved process management for plugins and acServer itself. Thanks to @mayfield for this one!
 
 ---
 
diff --git a/server_process.go b/server_process.go
index 80518b72d..3cab41c81 100644
--- a/server_process.go
+++ b/server_process.go
@@ -18,7 +18,6 @@ import (
 	"time"
 
 	"github.com/JustaPenguin/assetto-server-manager/pkg/udp"
-
 	"github.com/sirupsen/logrus"
 )
 
@@ -571,12 +570,10 @@ func (sp *AssettoServerProcess) onStop() error {
 	sp.raceEvent = nil
 
 	if err := sp.stopUDPListener(); err != nil {
-		return err
+		logrus.WithError(err).Error("UDP listener close errored")
 	}
 
-	if err := sp.stopChildProcesses(); err != nil {
-		return err
-	}
+	sp.stopChildProcesses()
 
 	for _, doneCh := range sp.notifyDoneChs {
 		select {
@@ -720,7 +717,7 @@ func (sp *AssettoServerProcess) startChildProcess(wd string, command string) err
 	return nil
 }
 
-func (sp *AssettoServerProcess) stopChildProcesses() error {
+func (sp *AssettoServerProcess) stopChildProcesses() {
 	sp.contentManagerWrapper.Stop()
 
 	for _, command := range sp.extraProcesses {
@@ -737,7 +734,6 @@ func (sp *AssettoServerProcess) stopChildProcesses() error {
 	}
 
 	sp.extraProcesses = make([]*exec.Cmd, 0)
-	return nil
 }
 
 func (sp *AssettoServerProcess) startUDPListener() error {

From b5133f75dd7dadfedb3bda216b0558040bc23fe1 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Thu, 3 Dec 2020 11:29:26 +0000
Subject: [PATCH 17/25] quick race now uses new track dropdowns

---
 .../views/pages/quick-race.html               | 50 +++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/cmd/server-manager/views/pages/quick-race.html b/cmd/server-manager/views/pages/quick-race.html
index cd07ddc60..28866d821 100644
--- a/cmd/server-manager/views/pages/quick-race.html
+++ b/cmd/server-manager/views/pages/quick-race.html
@@ -1,5 +1,19 @@
 {{ define "title" }}Quick Race{{ end }}
 
+
+{{ define "track-options" }}
+    {{ $tracks := .Tracks }}
+
+    {{ range $index, $track := $tracks }}
+        <option value="{{ $track.Name }}"
+                data-track-name="{{ $track.Name }}"
+        >
+            {{ $track.PrettyName }}
+        </option>
+    {{ end }}
+{{ end }}
+
+
 {{ define "content" }}
     <h1 class="text-center">Quick Race</h1>
 
@@ -16,16 +30,27 @@ <h1 class="text-center">Quick Race</h1>
 
                     <div class="col-sm-9">
                         <select class="form-control" name="Track" id="Track">
-                            {{ range $index, $track := .TrackOpts }}
-                                <option value="{{ $track.Name }}" class="{{ if $track.IsPaidDLC }}bg-dlc{{ end }}{{ if $track.IsMod }}bg-mod{{ end }}"
-                                >{{ prettify $track.Name false }}</option>
+                            {{ $split := .TrackOpts.Split }}
+
+
+                            {{ with $split.Stock }}
+                                <optgroup label="Stock">
+                                    {{ template "track-options" dict "Tracks" . }}
+                                </optgroup>
+                            {{ end }}
+
+                            {{ with $split.DLC }}
+                                <optgroup label="DLC">
+                                    {{ template "track-options" dict "Tracks" . }}
+                                </optgroup>
                             {{ end }}
-                        </select>
 
-                        <small style="cursor: default;">
-                            <span class="badge bg-dlc">DLC</span>
-                            <span class="badge bg-mod">Mod</span>
-                        </small>
+                            {{ with $split.Mod }}
+                                <optgroup label="Mod">
+                                    {{ template "track-options" dict "Tracks" . }}
+                                </optgroup>
+                            {{ end }}
+                        </select>
                     </div>
                 </div>
 
@@ -39,7 +64,14 @@ <h1 class="text-center">Quick Race</h1>
                         <select class="form-control" name="TrackLayout" id="TrackLayout">
                             {{ range $index, $track := .TrackOpts }}
                                 {{ range $layoutIndex, $layout := $track.Layouts }}
-                                    <option value="{{ $track.Name }}:{{ $layout }}">{{ $layout }}</option>
+                                    {{ $name := $layout }}
+                                    {{ $trackInfo := trackInfo $track.Name $layout }}
+
+                                    {{ with $trackInfo }}
+                                        {{ $name = $trackInfo.Name }}
+                                    {{ end }}
+
+                                    <option value="{{ $track.Name }}:{{ $layout }}" data-track-name="{{ $layout }}">{{ $name }}</option>
                                 {{ end }}
                             {{ end }}
                         </select>

From b39089241908ed8d88451ba0f5308ed1d9bf1188 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Mon, 7 Dec 2020 12:18:52 +0000
Subject: [PATCH 18/25] add missing APP_UDP_PORT option to Real Penalty

---
 CHANGELOG.md                  |  1 +
 cmd/server-manager/.gitignore |  2 +-
 migrations.go                 | 15 +++++++++++++++
 plugin_realpenalty_config.go  |  2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8db09b3d..7327a671e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ v1.7.9
 Added:
 
 * Improved the Track selection dropdowns in all Race Setup pages. You can now see more readable track names, and filter all tracks and layouts.
+* Adds missing Real Penalty 'APP_UDP_PORT' option.
 
 Fixed:
 
diff --git a/cmd/server-manager/.gitignore b/cmd/server-manager/.gitignore
index f92c314f3..2e385dfbe 100644
--- a/cmd/server-manager/.gitignore
+++ b/cmd/server-manager/.gitignore
@@ -1,4 +1,4 @@
-assetto/
+assetto
 .env
 server_manager.db
 config.yml
diff --git a/migrations.go b/migrations.go
index 275b8e9ca..8c18ce777 100644
--- a/migrations.go
+++ b/migrations.go
@@ -88,6 +88,7 @@ var (
 		addDefaultACSRGateOptionsToChampionships,
 		addSplitTypeToRaceWeekends,
 		fixCarDuplicationInRaceSetups,
+		addRealPenaltyAppUDPPort,
 	}
 )
 
@@ -1181,3 +1182,17 @@ func fixCarDuplicationInRaceSetups(s Store) error {
 
 	return nil
 }
+
+func addRealPenaltyAppUDPPort(s Store) error {
+	logrus.Infof("Running migration: Add Real Penalty App UDP Port")
+
+	rpOpts, err := s.LoadRealPenaltyOptions()
+
+	if err != nil {
+		return err
+	}
+
+	rpOpts.RealPenaltyAppConfig.General.AppUDPPort = rpOpts.RealPenaltyAppConfig.General.AppTCPPort
+
+	return s.UpsertRealPenaltyOptions(rpOpts)
+}
diff --git a/plugin_realpenalty_config.go b/plugin_realpenalty_config.go
index e44767a7a..83b45a267 100644
--- a/plugin_realpenalty_config.go
+++ b/plugin_realpenalty_config.go
@@ -46,6 +46,7 @@ func DefaultRealPenaltyAppConfig() RealPenaltyAppConfig {
 			UDPPort:           0,
 			UDPResponse:       "",
 			AppTCPPort:        53000,
+			AppUDPPort:        53000,
 		},
 		PluginsRelay: RealPenaltyPluginsRelay{
 			OtherUDPPlugin: "",
@@ -109,6 +110,7 @@ type RealPenaltyConfigGeneral struct {
 	UDPPort     int    `ini:"UDP_PORT" show:"-" help:"Listening UDP port - Set the same port (without IP) of cfg of the server, UDP_PLUGIN_ADDRESS "`
 	UDPResponse string `ini:"UDP_RESPONSE" show:"-" help:"Destination IP and UDP port for response - Set the same port in the cfg of the AC server, UDP_PLUGIN_LOCAL_PORT"`
 	AppTCPPort  int    `ini:"APP_TCP_PORT" show:"open" help:"Listening TCP port from AC app (to open in firewall/router). Must be one of 53000, 53001, 53002 to 53020, or the port of cfg AC server, HTTP_PORT + 27. The app will try all these ports on the ac server's ip address (until the right connection is found)"`
+	AppUDPPort  int    `ini:"APP_UDP_PORT" show:"open" help:"Listening UDP port from AC app (to open in firewall/router). Any free UDP port is OK"`
 
 	AppFile      string `ini:"APP_FILE" show:"-" help:"Path and file names of the app from the plugin package"`
 	ImagesFile   string `ini:"IMAGES_FILE" show:"-" help:"Path and file names of the images from the plugin package"`

From 1693a3464732711a90c4c700ab3d375c6e07cdc6 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Mon, 7 Dec 2020 15:47:08 +0000
Subject: [PATCH 19/25] remove registration requests on a duplicated
 championship (fixes #1044)

---
 CHANGELOG.md                                           | 1 +
 championship_manager.go                                | 9 ++++++---
 cmd/server-manager/views/pages/championships/view.html | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7327a671e..b220639a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ Fixed:
 * Fixes an issue where track names would not update when a track was reuploaded.
 * Fixes an issue where pitboxes could not be loaded for a track with an invalid JSON file.
 * Improved process management for plugins and acServer itself. Thanks to @mayfield for this one!
+* Duplicating a Championship now clears all registration requests.
 
 ---
 
diff --git a/championship_manager.go b/championship_manager.go
index 54ba9fe83..d556a36c0 100644
--- a/championship_manager.go
+++ b/championship_manager.go
@@ -1680,10 +1680,10 @@ func (cm *ChampionshipManager) HandleChampionshipSignUp(r *http.Request) (respon
 
 	signUpResponse := &ChampionshipSignUpResponse{
 		Created: time.Now(),
-		Name:    r.FormValue("Name"),
+		Name:    strings.TrimSpace(r.FormValue("Name")),
 		GUID:    NormaliseEntrantGUID(r.FormValue("GUID")),
-		Team:    r.FormValue("Team"),
-		Email:   r.FormValue("Email"),
+		Team:    strings.TrimSpace(r.FormValue("Team")),
+		Email:   strings.TrimSpace(r.FormValue("Email")),
 
 		Car:  r.FormValue("Car"),
 		Skin: r.FormValue("Skin"),
@@ -1871,6 +1871,9 @@ func (cm *ChampionshipManager) DuplicateChampionship(championshipID string) (*Ch
 		}
 	}
 
+	// clear sign up form responses
+	duplicateChampionship.SignUpForm.Responses = nil
+
 	logrus.Infof("New Championship: %s, %s. Duplicate of %s", duplicateChampionship.Name, duplicateChampionship.ID.String(), championshipID)
 
 	return duplicateChampionship, cm.UpsertChampionship(duplicateChampionship)
diff --git a/cmd/server-manager/views/pages/championships/view.html b/cmd/server-manager/views/pages/championships/view.html
index 7e7f046cb..6d78b299d 100644
--- a/cmd/server-manager/views/pages/championships/view.html
+++ b/cmd/server-manager/views/pages/championships/view.html
@@ -580,6 +580,9 @@ <h1 class="text-center">{{ $championship.Name }}</h1>
                         Export
                     </a>
 
+
+                    <a href="/championship/{{ $championship.ID }}/duplicate" class="dropdown-item">Duplicate</a>
+
                     {{ if gt $championship.Progress 0.0 }}
                         <a class="dropdown-item" id="simres-group" target="_blank" href="/championship/{{ $championship.ID.String }}/export-results">
                             View in Simresults

From 1f65579f6b6487eb053d60db90d6f81260c17c37 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Tue, 8 Dec 2020 17:47:37 +0000
Subject: [PATCH 20/25] initialise defaultWeather inside ListWeather (fixes
 #1046)

---
 CHANGELOG.md       |  1 +
 content_weather.go | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b220639a2..089eb7966 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ Fixed:
 * Fixes an issue where pitboxes could not be loaded for a track with an invalid JSON file.
 * Improved process management for plugins and acServer itself. Thanks to @mayfield for this one!
 * Duplicating a Championship now clears all registration requests.
+* Fixes a crash that could occur when concurrently reading weather configurations.
 
 ---
 
diff --git a/content_weather.go b/content_weather.go
index de0dafcd1..ff64d7848 100644
--- a/content_weather.go
+++ b/content_weather.go
@@ -15,18 +15,18 @@ const weatherInfoFile = "weather.ini"
 
 type Weather map[string]string
 
-// defaultWeather is loaded if there aren't any weather options on the server
-var defaultWeather = Weather{
-	"1_heavy_fog":    "Heavy Fog",
-	"2_light_fog":    "Light Fog",
-	"3_clear":        "Clear",
-	"4_mid_clear":    "Mid Clear",
-	"5_light_clouds": "Light Clouds",
-	"6_mid_clouds":   "Mid Clouds",
-	"7_heavy_clouds": "Heavy Clouds",
-}
-
 func ListWeather() (Weather, error) {
+	// defaultWeather is loaded if there aren't any weather options on the server
+	defaultWeather := Weather{
+		"1_heavy_fog":    "Heavy Fog",
+		"2_light_fog":    "Light Fog",
+		"3_clear":        "Clear",
+		"4_mid_clear":    "Mid Clear",
+		"5_light_clouds": "Light Clouds",
+		"6_mid_clouds":   "Mid Clouds",
+		"7_heavy_clouds": "Heavy Clouds",
+	}
+
 	baseDir := filepath.Join(ServerInstallPath, "content", "weather")
 
 	weatherFolders, err := ioutil.ReadDir(baseDir)

From 1ec0c50c408401f28b7b48da5bda7c8cc2da7f7d Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Wed, 9 Dec 2020 19:06:51 +0000
Subject: [PATCH 21/25] fixes an issue where duplicating a championship with
 race weekends would result in empty race weekends

---
 CHANGELOG.md            |  9 +++++++++
 championship_manager.go | 18 +++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 089eb7966..f20d422ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+v1.7.10
+-------
+
+Fixed:
+
+* Fixes an issue where duplicating a Championship with Race Weekends inside it would result in the Race Weekends not copying across correctly.
+
+---
+
 v1.7.9
 ------
 
diff --git a/championship_manager.go b/championship_manager.go
index d556a36c0..250abdb1f 100644
--- a/championship_manager.go
+++ b/championship_manager.go
@@ -1864,10 +1864,22 @@ func (cm *ChampionshipManager) DuplicateChampionship(championshipID string) (*Ch
 	duplicateChampionship.Name = championship.Name + " Duplicate"
 
 	for _, event := range events {
-		_, err := duplicateChampionship.ImportEvent(&event)
+		if event.IsRaceWeekend() {
+			newEvent, err := duplicateChampionship.ImportEvent(event.RaceWeekend)
 
-		if err != nil {
-			return nil, err
+			if err != nil {
+				return nil, err
+			}
+
+			if err := cm.store.UpsertRaceWeekend(newEvent.RaceWeekend); err != nil {
+				return nil, err
+			}
+		} else {
+			_, err = duplicateChampionship.ImportEvent(&event)
+
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
 

From 4cfb4b09ea441ad993100d4950f71053efeba4fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Dec 2020 15:56:10 +0000
Subject: [PATCH 22/25] Bump ini from 1.3.5 to 1.3.7 in
 /cmd/server-manager/typescript

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
---
 cmd/server-manager/typescript/package-lock.json | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/cmd/server-manager/typescript/package-lock.json b/cmd/server-manager/typescript/package-lock.json
index 0cb6ca3fd..f774e2639 100644
--- a/cmd/server-manager/typescript/package-lock.json
+++ b/cmd/server-manager/typescript/package-lock.json
@@ -3876,12 +3876,6 @@
           "dev": true,
           "optional": true
         },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
@@ -5794,9 +5788,9 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
+      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==",
       "dev": true
     },
     "inline-source-map": {

From 03fe5ec18263f8fdf3bd5f4d12311094c7cc8172 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Wed, 6 Jan 2021 12:25:43 +0000
Subject: [PATCH 23/25] update real penalty install instructions (fixes #1035)

---
 .../views/pages/server/realpenalty-options.html           | 8 +++-----
 plugin_realpenalty_config.go                              | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cmd/server-manager/views/pages/server/realpenalty-options.html b/cmd/server-manager/views/pages/server/realpenalty-options.html
index 37d570f23..37e525736 100644
--- a/cmd/server-manager/views/pages/server/realpenalty-options.html
+++ b/cmd/server-manager/views/pages/server/realpenalty-options.html
@@ -40,11 +40,9 @@ <h3>Download Logs</h3>
 
         <ol>
             <li><a href="https://www.racedepartment.com/downloads/real-penalty-tool.29591/history">Download Real Penalty {{ $.RealPenaltySupportedVersion }}</a></li>
-            <li>Extract <code>AC_Penalty_Tool_{{ $.RealPenaltySupportedVersion }}.zip</code></li>
-            <li>Navigate to the <code>Server_Plugin</code> folder inside the extracted folder</li>
-            <li>Move the <code>tracks</code> and <code>files</code> folders into the <code>plugin</code> folder</li>
-            <li>Create a new folder called <code>realpenalty</code> (case sensitive) in your Assetto Corsa Server Folder</li>
-            <li>Copy the contents of the <code>plugin</code> folder into this new <code>realpenalty</code> folder</li>
+            <li>Extract <code>Real Penalty {{ $.RealPenaltySupportedVersion }}.zip</code></li>
+            <li>Rename the extracted folder to <code>realpenalty</code></li>
+            <li>Move that folder inside your <code>assetto</code> folder. If you are using multiserver, copy it inside each one of them. E.g. inside <code>youracserver/servers/SERVER_00/assetto/</code></li>
             <li>Make sure that you have set UDP Plugin Address and UDP Plugin Local Port in <a href="/server-options">Server Options</a></li>
             <li>Refresh this page!</li>
         </ol>
diff --git a/plugin_realpenalty_config.go b/plugin_realpenalty_config.go
index 83b45a267..747f875d5 100644
--- a/plugin_realpenalty_config.go
+++ b/plugin_realpenalty_config.go
@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	RealPenaltySupportedVersion = "v3.00.02"
+	RealPenaltySupportedVersion = "v3.02.01b"
 
 	realPenaltyAppConfigIniPath  = "settings.ini"
 	realPenaltySettingsIniPath   = "penalty_settings.ini"

From 9ee65643badb3e790b13898d0f3754e490ece1b2 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Fri, 15 Jan 2021 11:04:07 +0000
Subject: [PATCH 24/25] manually instruct KMR to stop so it doesn't corrupt
 itself

---
 CHANGELOG.md      |  1 +
 server_process.go | 61 +++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f20d422ec..ccf9dba43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ v1.7.10
 Fixed:
 
 * Fixes an issue where duplicating a Championship with Race Weekends inside it would result in the Race Weekends not copying across correctly.
+* KissMyRank is now instructed to stop using a command in its console. This should hopefully prevent issues with data files corrupting on stop.
 
 ---
 
diff --git a/server_process.go b/server_process.go
index 3cab41c81..554395333 100644
--- a/server_process.go
+++ b/server_process.go
@@ -53,7 +53,7 @@ type AssettoServerProcess struct {
 	raceEvent      RaceEvent
 	cmd            *exec.Cmd
 	mutex          sync.Mutex
-	extraProcesses []*exec.Cmd
+	extraProcesses []*pluginProcess
 
 	logFile, errorLogFile io.WriteCloser
 
@@ -68,6 +68,11 @@ type AssettoServerProcess struct {
 	sessionStartedChan chan struct{}
 }
 
+type pluginProcess struct {
+	cmd   *exec.Cmd
+	stdin io.WriteCloser
+}
+
 func NewAssettoServerProcess(callbackFunc udp.CallbackFunc, store Store, contentManagerWrapper *ContentManagerWrapper) *AssettoServerProcess {
 	sp := &AssettoServerProcess{
 		start:                 make(chan RaceEvent),
@@ -659,13 +664,22 @@ func (sp *AssettoServerProcess) startPlugin(wd string, plugin *CommandPlugin) er
 
 	cmd.Dir = pluginDir
 
+	stdin, err := cmd.StdinPipe()
+
+	if err != nil {
+		return err
+	}
+
 	err = cmd.Start()
 
 	if err != nil {
 		return err
 	}
 
-	sp.extraProcesses = append(sp.extraProcesses, cmd)
+	sp.extraProcesses = append(sp.extraProcesses, &pluginProcess{
+		cmd:   cmd,
+		stdin: stdin,
+	})
 
 	return nil
 }
@@ -705,6 +719,11 @@ func (sp *AssettoServerProcess) startChildProcess(wd string, command string) err
 	cmd.Stderr = pluginsOutput
 
 	cmd.Dir = pluginDir
+	stdin, err := cmd.StdinPipe()
+
+	if err != nil {
+		return err
+	}
 
 	err = cmd.Start()
 
@@ -712,7 +731,10 @@ func (sp *AssettoServerProcess) startChildProcess(wd string, command string) err
 		return err
 	}
 
-	sp.extraProcesses = append(sp.extraProcesses, cmd)
+	sp.extraProcesses = append(sp.extraProcesses, &pluginProcess{
+		cmd:   cmd,
+		stdin: stdin,
+	})
 
 	return nil
 }
@@ -723,17 +745,36 @@ func (sp *AssettoServerProcess) stopChildProcesses() {
 	for _, command := range sp.extraProcesses {
 		waitDone := make(chan error, 1)
 		go func() {
-			waitDone <- command.Wait()
+			waitDone <- command.cmd.Wait()
 		}()
-		if err := stopCommand(command, waitDone, 30); err != nil {
+
+		if command.cmd.Dir == filepath.Join(ServerInstallPath, "kissmyrank") {
+			_, _ = fmt.Fprintf(command.stdin, "exit\r\n")
+
+			kmrStopTimeout := time.After(time.Second * 15)
+
+			select {
+			case err := <-waitDone:
+				if err != nil {
+					logrus.WithError(err).Errorf("KissMyRank stopped with an error")
+				} else {
+					logrus.Infof("KissMyRank stopped correctly")
+				}
+				continue
+			case <-kmrStopTimeout:
+				logrus.Infof("KissMyRank did not stop correctly, manually killing...")
+			}
+		}
+
+		if err := stopCommand(command.cmd, waitDone, 30); err != nil {
 			if _, isExit := err.(*exec.ExitError); !isExit {
-				name := filepath.Base(command.Path)
-				logrus.WithError(err).Warnf("Command stop problem: %s [pid: %d]", name, command.Process.Pid)
+				name := filepath.Base(command.cmd.Path)
+				logrus.WithError(err).Warnf("Command stop problem: %s [pid: %d]", name, command.cmd.Process.Pid)
 			}
 		}
 	}
 
-	sp.extraProcesses = make([]*exec.Cmd, 0)
+	sp.extraProcesses = make([]*pluginProcess, 0)
 }
 
 func (sp *AssettoServerProcess) startUDPListener() error {
@@ -817,7 +858,7 @@ func FreeUDPPort() (int, error) {
 	return l.LocalAddr().(*net.UDPAddr).Port, nil
 }
 
-var ErrCommandUnstopable = errors.New("servermanager: command is unstopable")
+var ErrCommandUnstoppable = errors.New("servermanager: command is unstoppable")
 
 func stopCommand(cmd *exec.Cmd, waiter chan error, timeout float32) error {
 	name := filepath.Base(cmd.Path)
@@ -840,7 +881,7 @@ func stopCommand(cmd *exec.Cmd, waiter chan error, timeout float32) error {
 		select {
 		case <-time.After(time.Duration(killWait) * time.Second):
 			logrus.Errorf("Process %d could not be killed after %g seconds.", pid, timeout)
-			return ErrCommandUnstopable
+			return ErrCommandUnstoppable
 		case err := <-waiter:
 			return err
 		}

From 8f8fa5f7cb108da9dedc7c694bc826a537f9dd45 Mon Sep 17 00:00:00 2001
From: Callum Jones <cj@icj.me>
Date: Thu, 28 Jan 2021 15:19:28 +0000
Subject: [PATCH 25/25] sort race weekend entrants by pitbox after they have
 been added to an entrylist in the filter step

---
 CHANGELOG.md    | 1 +
 race_weekend.go | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccf9dba43..a4ae92b5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Fixed:
 
 * Fixes an issue where duplicating a Championship with Race Weekends inside it would result in the Race Weekends not copying across correctly.
 * KissMyRank is now instructed to stop using a command in its console. This should hopefully prevent issues with data files corrupting on stop.
+* Fixes an issue where Race Weekend sessions could incorrectly sort splits out of order.
 
 ---
 
diff --git a/race_weekend.go b/race_weekend.go
index 699d07375..6d45f757f 100644
--- a/race_weekend.go
+++ b/race_weekend.go
@@ -869,6 +869,11 @@ func (rws *RaceWeekendSession) GetRaceWeekendEntryList(rw *RaceWeekend, override
 		}
 	}
 
+	// do an initial sort of the entrylist by pitboxes, as sessions may add drivers out of order.
+	sort.Slice(entryList, func(i, j int) bool {
+		return entryList[i].PitBox < entryList[j].PitBox
+	})
+
 	if rw.SessionCanBeRun(rws) {
 		// sorting can only be run if a session is ready to be run.
 		sorter := GetRaceWeekendEntryListSort(rws.SortType)