From a4a4ba817fc3ae5e85cf6877051b4f33ec5bdbe2 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 22 Jun 2017 10:27:28 -0700
Subject: [PATCH] Fixup merge - whoops

---
 interface/resources/qml/styles-uit/HifiConstants.qml | 2 +-
 scripts/defaultScripts.js                            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index f321f49478..11bcf33419 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -50,7 +50,7 @@ Item {
         id: colors
 
         // Base colors
-        readonly property color baseGray: "#404040"
+        readonly property color baseGray: "#393939"
         readonly property color darkGray: "#121212"
         readonly property color baseGrayShadow: "#252525"
         readonly property color baseGrayHighlight: "#575757"
diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 2270118861..4902f66a51 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -25,6 +25,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
     "system/tablet-goto.js",
     "system/marketplaces/marketplaces.js",
     "system/edit.js",
+    "system/spectatorCamera.js",
     "system/notifications.js",
     "system/dialTone.js",
     "system/firstPersonHMD.js",