Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

1 files changed, 8 insertions, 2 deletions

diff --git a/js/panels/Resizer.js b/js/panels/Resizer.js
index ca6ed062..0252c4fb 100755
--- a/js/panels/Resizer.js
+++ b/js/panels/Resizer.js
@@ -90,16 +90,22 @@ exports.Resizer = Montage.create(Component, {
             return this._panel;
         },
         set: function(val) {
-            this._panel = val
+            this._panel = val;
+            if(val._element) this._panel = val._element;
         }
     },
+
+    height: {
+        value: null
+    },
  
     handleClick: {
         value: function() {
  
         }
     },
- 
+
+
     handleMousedown: {
         value: function(e) {
             e.preventDefault();