Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/js/components/menu/menu.reel/menu.js b/js/components/menu/menu.reel/menu.js
index fb221640..50d3f0bc 100755
--- a/js/components/menu/menu.reel/menu.js
+++ b/js/components/menu/menu.reel/menu.js
@@ -9,6 +9,23 @@ var Montage = require("montage/core/core").Montage,
 
 exports.Menu = Montage.create(Component, {
 
+    _currentDocument: {
+            value : null
+    },
+
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(value) {
+            if (value === this._currentDocument) {
+                return;
+            }
+
+            this._currentDocument = value;
+        }
+    },
+
     _active: {
         value: false
     },