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>

1 files changed, 2 insertions, 2 deletions

diff --git a/node_modules/montage/ui/popup/popup.reel/popup.html b/node_modules/montage/ui/popup/popup.reel/popup.html
index 5bc74dae..140d7850 100755
--- a/node_modules/montage/ui/popup/popup.reel/popup.html
+++ b/node_modules/montage/ui/popup/popup.reel/popup.html
@@ -11,7 +11,7 @@
         <script type="text/montage-serialization">
 {
     "slot1": {
-        "prototype": "montage/ui/slot.reel",
+        "prototype": "ui/slot.reel",
         "properties": {
             "element": {
                 "#": "popup-content"
@@ -19,7 +19,7 @@
         }
     },
     "owner": {
-        "prototype": "montage/ui/popup/popup.reel",
+        "prototype": "ui/popup/popup.reel",
         "properties": {
             "element": {
                 "#": "popup-container"