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

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/components/tools-properties/brush-properties.reel/brush-properties.html
	js/components/tools-properties/fill-properties.reel/fill-properties.html
	js/components/tools-properties/pen-properties.reel/pen-properties.html
	js/components/tools-properties/pencil-properties.reel/pencil-properties.html
	js/components/tools-properties/selection-properties.reel/selection-properties.html
	js/components/tools-properties/shape-properties.reel/shape-properties.html
	js/components/tools-properties/tag-properties.reel/tag-properties.html
	js/components/tools-properties/text-properties.reel/text-properties.html

1 files changed, 0 insertions, 6 deletions

diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index 027f3a40..c39f3a56 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -27,7 +27,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
     /* === BEGIN: Models === */
         // isSelected: whether or not the style is selected
         _isSelected: {
-                serializable: true,
                 value: false
         },
         isSelected: {
@@ -60,7 +59,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
    
    // Property for this editor
     _editorProperty: {
-        serializable: true,
         value: ""
     },
     editorProperty: {
@@ -76,7 +74,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
     
     // Value for the property for this editor.
     _editorValue: {
-        serializable: true,
         value: ""
     },
     editorValue: {
@@ -92,7 +89,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
     
         // The tweener used to change the value for this property. 
     _ruleTweener: {
-        serializable: true,
         value: false
     },
     ruleTweener: {
@@ -137,7 +133,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
     
     // whichView: which view should we show: hintable or propval
     _whichView : {
-        serializable: true,
         value: "hintable"
     },
     whichView: {
@@ -161,7 +156,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
         // styleID: the id for this style;
         // Used to publish events
         _styleID : {
-                serializable: true,
                 value: null
         },
         styleID: {