Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

Conflicts:
	js/stage/binding-view.reel/binding-view.js

1 files changed, 2 insertions, 2 deletions

diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html
index cd180dcc..9cebd32e 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html
@@ -11,7 +11,7 @@
     <script type="text/montage-serialization">
         {
             "overlay": {
-                "prototype": "montage/ui/slot.reel",
+                "prototype": "ui/slot.reel",
                 "properties": {
                     "element": {"#": "editor-slot"},
                     "delegate": {"@": "owner"}
@@ -19,7 +19,7 @@
             },
 
             "owner": {
-                "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel",
+                "prototype": "ui/rich-text-editor/rich-text-editor.reel",
                 "properties": {
                     "element": {"#": "rich-text-editor-container"},
                     "_overlaySlot": {"@": "overlay"}