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, 14 insertions, 0 deletions

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 6d9d2e89..76a5e62b 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -62,6 +62,20 @@ exports.BaseDocumentModel = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+    _selection: {
+        value: []
+    },
+
+    selection: {
+        get: function() {
+            return this._selection;
+        },
+        set: function(value) {
+            this._selection = value;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     fileTemplate: {
         value: null
     },