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, 5 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index b13a037f..8b6826ed 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -14,12 +14,10 @@ var Tween = exports.Tween = Montage.create(Component, {
     },
 
     _tweenData:{
-        serializable: true,
         value:{}
     },
 
     tweenData:{
-        serializable: true,
         get:function(){
             return this._tweenData;
         },
@@ -32,7 +30,6 @@ var Tween = exports.Tween = Montage.create(Component, {
     },
 
     _spanWidth: {
-        serializable: true,
         value: 0
     },
 
@@ -109,7 +106,6 @@ var Tween = exports.Tween = Montage.create(Component, {
     },
 
     _tweenedProperties:{
-        serializable: true,
         value:[]
     },
 
@@ -124,7 +120,6 @@ var Tween = exports.Tween = Montage.create(Component, {
     },
 
     _isTweenAnimated:{
-        serializable:true,
         value:false
     },