Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 7 insertions, 7 deletions

diff --git a/js/panels/color/colorpanel.js b/js/panels/color/colorpanel.js
index 7815030e..988a7230 100755
--- a/js/panels/color/colorpanel.js
+++ b/js/panels/color/colorpanel.js
@@ -30,18 +30,18 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =   require("montage/core/core").Montage,
-    PanelBase = require("js/panels/panelbase").PanelBase;
+var Montage =   require("montage/core/core").Montage,
+    PanelBase = require("js/panels/panelbase").PanelBase;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as ColorPanel
 exports.ColorPanel = Montage.create(PanelBase, {
     ////////////////////////////////////////////////////////////////////
     //Panel Configuration
-    panelName:                  {value: "Color",                                        writable: true, enumerable: true, configurable: true},
-    panelHeaderID:              {value: "colorPanelHeader",             writable: true, enumerable: true, configurable: true},
-    disclosureIconID:   {value: "colorPanelDisclosureIcon",     writable: true, enumerable: true, configurable: true},
-    closeButtonID:              {value: "colorPanelCloseButton",        writable: true, enumerable: true, configurable: true},
-    panelContentID:     {value: "colorPanelContent",            writable: true, enumerable: true, configurable: true},
+    panelName:          {value: "Color",                    writable: true, enumerable: true, configurable: true},
+    panelHeaderID:      {value: "colorPanelHeader",         writable: true, enumerable: true, configurable: true},
+    disclosureIconID:   {value: "colorPanelDisclosureIcon", writable: true, enumerable: true, configurable: true},
+    closeButtonID:      {value: "colorPanelCloseButton",    writable: true, enumerable: true, configurable: true},
+    panelContentID:     {value: "colorPanelContent",        writable: true, enumerable: true, configurable: true},
     ////////////////////////////////////////////////////////////////////
     //Creating panel from base view class
     init: {