Merge remote-tracking branch 'github/master' into open450b

Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469

Conflicts:
	platform/commonUI/general/bundle.json

platform/commonUI/general/bundle.js

@@ -37,7 +37,6 @@ define([
     "./src/controllers/ViewSwitcherController",
     "./src/controllers/BottomBarController",
     "./src/controllers/GetterSetterController",
-    "./src/controllers/SplitPaneController",
     "./src/controllers/SelectorController",
     "./src/controllers/ObjectInspectorController",
     "./src/controllers/BannerController",
@@ -66,7 +65,6 @@ define([
     ViewSwitcherController,
     BottomBarController,
     GetterSetterController,
-    SplitPaneController,
     SelectorController,
     ObjectInspectorController,
     BannerController,
@@ -241,10 +239,6 @@ define([
                         "$scope"
                     ]
                 },
-                {
-                    "key": "SplitPaneController",
-                    "implementation": SplitPaneController
-                },
                 {
                     "key": "SelectorController",
                     "implementation": SelectorController,