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

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

2 files changed, 6 insertions, 6 deletions

diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 0b178c84..ba6154c9 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -63,12 +63,12 @@ exports.PanelsData = Montage.create(Montage, {
         {
             name: "Materials",
             groups: ["default"],
-            minHeight: 100,
-            height: 100,
+            minHeight: 270,
+            height: 270,
             maxHeight: null,
-            flexible: true,
+            flexible: false,
             collapsed: true,
-            scrollable: true,
+            scrollable: false,
             open: true,
             modulePath: "js/panels/Materials/materials-library-panel.reel",
             moduleName: "MaterialsLibraryPanel"
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 73bcd7fd..5619fe60 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -74,7 +74,7 @@ exports.ToolsData = Montage.create(Montage, {
         value: 13
     },
 
-    // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above. 
+    // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above.
     //       Code in the keyboard mediator and ninja.js accesses the array below through the index constants above
     defaultToolsData: {
         value: [
@@ -301,5 +301,5 @@ exports.ToolsData = Montage.create(Montage, {
     selectedToolInstance : {
         value: null
     }
-    
+
 });