Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 2 insertions, 16 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index d1dc9f34..157cbc64 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -14,25 +14,11 @@ exports.PiData = Montage.create( Montage, {
             {
                 label: "Style",
 
-                                Section: [
-                                    [
-
-                                    ]
-                                ]
-            }
-        ]
-    },
-
-    stagePi: {
-        value: [
-            {
-                label: "Style",
-
                 Section: [
                     [
                         {
-                            type : "chip",
-                            id : "background",
+                            type: "chip",
+                            id: "background",
                             prop: "background"
                         }
                     ]