Merge branch 'refs/heads/Ninja-Internal' into FileIO

Conflicts:
	js/document/html-document.js
	js/helper-classes/3D/draw-utils.js

1 files changed, 4 insertions, 0 deletions

diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index 2b308258..33f9b3a7 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -57,6 +57,10 @@ exports.Panel = Montage.create(Component, {
         value: null
     },
 
+    disabled: {
+        value:false
+    },
+
     collapsed: {
         get: function() {
             return this._collapsed;