Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	js/data/panels-data.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 37957892..6792aa51 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -81,11 +81,11 @@ exports.PanelsData = Montage.create(Montage, {
             height: 195,
             maxHeight: null,
             flexible: true,
-            scrollable: true,
-            collapsed: true,
+            scrollable: false,
+            collapsed: false,
             open: true,
-            modulePath: "js/panels/CSSPanel/CSSPanelBase.reel",
-            moduleName: "CSSPanelBase"
+            modulePath: "js/panels/css-panel/css-panel.reel",
+            moduleName: "CssPanel"
         },
         {
             name: "Presets",