Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes

Conflicts:
	js/panels/properties.reel/sections/position-size.reel/position-size.html

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

6 files changed, 9 insertions, 9 deletions

diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
index b8b9f39a..332b2932 100644
--- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
+++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
@@ -45,7 +45,7 @@
         }
     },
     "owner": {
-        "prototype": "montage-google/feed-reader/feed-entry.reel",
+        "prototype": "feed-reader/feed-entry.reel",
         "properties": {
             "element": {"#": "feed-entry"}
         }
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
index 99a353b9..4d6792a1 100644
--- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
+++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
@@ -24,7 +24,7 @@
     },
 
     "feedEntry": {
-        "prototype": "montage-google/feed-reader/feed-entry.reel",
+        "prototype": "feed-reader/feed-entry.reel",
         "properties": {
             "element": {"#": "feed-entry"}
         },
@@ -38,7 +38,7 @@
     },
 
     "owner": {
-        "prototype": "montage-google/feed-reader/feed-reader.reel",
+        "prototype": "feed-reader/feed-reader.reel",
         "properties": {
             "element": {"#": "feed-reader"}
         }
diff --git a/node_modules/montage-google/map.reel/map.html b/node_modules/montage-google/map.reel/map.html
index fee3a38e..bd41f47e 100644
--- a/node_modules/montage-google/map.reel/map.html
+++ b/node_modules/montage-google/map.reel/map.html
@@ -15,7 +15,7 @@
     {
         
         "owner": {
-            "prototype": "montage-google/map.reel",
+            "prototype": "map.reel",
             "properties": {
                 "element": {"#": "map-container"},
                 "mapEl": {"#": "map"}
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
index f7c8a766..dc70a19c 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
@@ -12,7 +12,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "prototype": "montage-google/picasa-carousel.reel",
+            "prototype": "picasa-carousel.reel",
             "properties": {
                 "element": {"#": "montage-google-picasa-carousel"},
                 "flow": {"@": "flow"}
@@ -29,7 +29,7 @@
             }
         },
         "image": {
-            "prototype": "montage-google/picasa-carousel.reel/image.reel",
+            "prototype": "picasa-carousel.reel/image.reel",
             "properties": {
                 "element": {"#": "image"}
             },
diff --git a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
index 99a8a698..112fda72 100644
--- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
+++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
@@ -10,7 +10,7 @@
     <script type="text/montage-serialization">
     {
         "player": {
-            "prototype": "montage-google/youtube-player.reel",
+            "prototype": "youtube-player.reel",
             "properties": {
                 "element": {"#": "player"}
             }
@@ -41,7 +41,7 @@
         },
 
         "owner": {
-            "module": "montage-google/youtube-channel.reel",
+            "module": "youtube-channel.reel",
             "name": "YoutubeChannel",
             "properties": {
                 "element": {"#": "container"},
diff --git a/node_modules/montage-google/youtube-player.reel/youtube-player.html b/node_modules/montage-google/youtube-player.reel/youtube-player.html
index d51cecdb..41e5922b 100644
--- a/node_modules/montage-google/youtube-player.reel/youtube-player.html
+++ b/node_modules/montage-google/youtube-player.reel/youtube-player.html
@@ -11,7 +11,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "prototype": "montage-google/youtube-player.reel",
+            "prototype": "youtube-player.reel",
             "properties": {
                 "element": {"#": "iframe"}
             }