[Themes] Resolve conflicts

Resolve conflicts in preparation for merge, nasa/openmctweb#118

platform/features/layout/bundle.json

@@ -1,6 +1,6 @@
 {
     "name": "Layout components.",
-    "description": "Plug in adding Layout capabiltiies.",
+    "description": "Plug in adding Layout capabilities.",
     "extensions": {
         "views": [
             {
@@ -85,7 +85,7 @@
                                 },
                                 {
                                     "property": "fill",
-                                    "glyph": "\u00E0",
+                                    "glyph": "\ue606",
                                     "control": "color"
                                 },
                                 {

platform/features/layout/src/FixedController.js

@@ -229,6 +229,7 @@ define(
             // Position a panel after a drop event
             function handleDrop(e, id, position) {
                 // Don't handle this event if it has already been handled
+			  	// color is set to "" to let the CSS theme determine the default color
                 if (e.defaultPrevented) {
                     return;
                 }
@@ -240,7 +241,7 @@ define(
                     y: Math.floor(position.y / self.gridSize[1]),
                     id: id,
                     stroke: "transparent",
-                    color: "#cccccc",
+                    color: "",
                     titled: true,
                     width: DEFAULT_DIMENSIONS[0],
                     height: DEFAULT_DIMENSIONS[1]

platform/features/layout/src/elements/ElementFactory.js

@@ -44,8 +44,7 @@ define(
                 },
                 "fixed.text": {
                     fill: "transparent",
-                    stroke: "transparent",
-                    color: "#cccccc"
+                    stroke: "transparent"
                 }
             },
             DIALOGS = {