Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 640 insertions, 640 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 3be766c4..48596703 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -69,50 +69,50 @@ var Layer = exports.Layer = Montage.create(Component, {
         value: null,
         serializable: true
     },
-    
+
     /* Begin: Models */
-   
-        /* Main collapser model: the main collapser for the layer */
+
+    /* Main collapser model: the main collapser for the layer */
     _mainCollapser : {
-        value: false
+        value: false
     },
     mainCollapser: {
-        get: function() {
-                return this._mainCollapser;
-        },
-        set: function(newVal) {
-                this._mainCollapser = newVal;
-        },
+        get: function() {
+            return this._mainCollapser;
+        },
+        set: function(newVal) {
+            this._mainCollapser = newVal;
+        },
         serializable: true
     },
-    
+
     /* Style models: the array of styles, and the repetition that uses them */
     _arrLayerStyles : {
-            value: []
+        value: []
     },
     arrLayerStyles : {
-        serializable: true,
-        get: function() {
-                return this._arrLayerStyles;
-        },
-        set: function(newVal) {
-                this._arrLayerStyles = newVal;
-        }
+        serializable: true,
+        get: function() {
+            return this._arrLayerStyles;
+        },
+        set: function(newVal) {
+            this._arrLayerStyles = newVal;
+        }
     },
     _styleRepetition : {
-        value: false
+        value: false
     },
     styleRepetition : {
         serializable: true,
-        get: function() {
-                return this._styleRepetition;
-        },
-        set: function(newVal) {
-                this._styleRepetition = newVal;
-        }
+        get: function() {
+            return this._styleRepetition;
+        },
+        set: function(newVal) {
+            this._styleRepetition = newVal;
+        }
     },
     _styleCounter : {
-        value: 0
+        value: 0
     },
     styleCounter:{
         serializable:true,
@@ -124,21 +124,21 @@ var Layer = exports.Layer = Montage.create(Component, {
         }
     },
     _selectedStyleIndex: {
-        value: false
+        value: false
     },
     selectedStyleIndex: {
-        get: function() {
-                return this._selectedStyleIndex;
-        },
-        set: function(newVal) {
-                if (typeof(newVal) === "undefined") {
-                        return;
-                }
-                if (newVal !== this._selectedStyleIndex) {
-                        this._selectedStyleIndex = newVal;
-                        this.layerData.selectedStyleIndex = newVal;
-                }
-        }
+        get: function() {
+            return this._selectedStyleIndex;
+        },
+        set: function(newVal) {
+            if (typeof(newVal) === "undefined") {
+                return;
+            }
+            if (newVal !== this._selectedStyleIndex) {
+                this._selectedStyleIndex = newVal;
+                this.layerData.selectedStyleIndex = newVal;
+            }
+        }
     },
     _storedStyleIndex : {
         value: false
@@ -146,39 +146,39 @@ var Layer = exports.Layer = Montage.create(Component, {
 
     /* Layer models: the name, ID, and selected and animation booleans for the layer */
     _layerName:{
-        value: ""
+        value: ""
     },
-    
+
     layerName:{
-        serializable: true,
+        serializable: true,
         get:function(){
             return this._layerName;
         },
         set:function(newVal){
-                        if (this._layerEditable.value !== newVal) {
-                                this._layerEditable.value = newVal;
-                        }
-                        if (this._layerName !== newVal) {
-                                this._layerName = newVal;
-                        }
-                        if (this.layerData.layerName !== newVal) {
-                                this.layerData.layerName = newVal;
-                        }
-
-                if (typeof(this.dynamicLayerName) !== "undefined") {
-                        if (this.dynamicLayerName.value !== newVal) {
-                                this.dynamicLayerName.value = newVal;
-                        }
-                }
-                this.needsDraw = true;
+            if (this._layerEditable.value !== newVal) {
+                this._layerEditable.value = newVal;
+            }
+            if (this._layerName !== newVal) {
+                this._layerName = newVal;
+            }
+            if (this.layerData.layerName !== newVal) {
+                this.layerData.layerName = newVal;
+            }
+
+            if (typeof(this.dynamicLayerName) !== "undefined") {
+                if (this.dynamicLayerName.value !== newVal) {
+                    this.dynamicLayerName.value = newVal;
+                }
+            }
+            this.needsDraw = true;
         }
     },
     _layerID:{
-        value: "Default Layer ID"
+        value: "Default Layer ID"
     },
 
     layerID:{
-        serializable: true,
+        serializable: true,
         get:function(){
             return this._layerID;
         },
@@ -188,132 +188,132 @@ var Layer = exports.Layer = Montage.create(Component, {
         }
     },
     _layerTag:{
-        value: "tag"
+        value: "tag"
     },
-    
+
     layerTag:{
-        serializable: true,
+        serializable: true,
         get:function(){
             return this._layerTag;
         },
         set:function(newVal){
-                this._layerTag = newVal;
-                this.layerData.layerTag = newVal;
+            this._layerTag = newVal;
+            this.layerData.layerTag = newVal;
         }
     },
     _docUUID : {
-        value: null
+        value: null
     },
     docUUID : {
-        serializable: true,
-        get: function() {
-                return this._docUUID;
-        },
-        set: function(newVal) {
-                this._docUUID = newVal;
-        }
-    },
-    
+        serializable: true,
+        get: function() {
+            return this._docUUID;
+        },
+        set: function(newVal) {
+            this._docUUID = newVal;
+        }
+    },
+
     _stageElement: {
-        value: null
+        value: null
     },
-    
+
     stageElement: {
-        get: function() {
+        get: function() {