Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
	js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css

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

1 files changed, 0 insertions, 13 deletions

diff --git a/js/models/app-model.js b/js/models/app-model.js
index 52e298a5..1351921b 100755
--- a/js/models/app-model.js
+++ b/js/models/app-model.js
@@ -34,19 +34,6 @@ var Montage = require("montage/core/core").Montage,
 
 exports.AppModel = Montage.create(Component, {
 
-    _livePreview: {
-        value: false
-    },
-
-    livePreview: {
-        get: function() {
-            return this._livePreview;
-        },
-        set: function(value) {
-            this._livePreview = value;
-        }
-    },
-
     _layoutView: {
         value: "layoutAll"
     },