Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id

Conflicts:
	js/components/tools-properties/tag-properties.reel/tag-properties.html

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 65161b4f..d1dc9f34 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -100,7 +100,7 @@ exports.PiData = Montage.create( Montage, {
             }
         ]
     },
-    imagePi: {
+    imgPi: {
         value: [
             {
                 label: "Image Properties",
@@ -807,8 +807,8 @@ exports.PiData = Montage.create( Montage, {
                     ]
                 ]
             }
-        ] //value: [
-    } //BrushStrokePi: {
+        ]
+    }
 });