Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/document/document-html.js
	js/document/templates/app/main.js
	js/panels/Panel.reel/Panel.js
	node_modules/montage/ui/native-control.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
index 13ba0518..3665ca1b 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
@@ -27,7 +27,7 @@ The easiest way to create a RichTextEditor is with a serialization and a <div
 <pre class="sh_javascript">
 {
 "editor": {
-   "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel",
+   "prototype": "ui/rich-text-editor/rich-text-editor.reel",
    "properties": {
       "element": {"#": "editor" }
    }
@@ -649,13 +649,13 @@ exports.RichTextEditor = Montage.create(RichTextEditorBase,/** @lends module:"mo
                     clearTimeout(thisRef._updateValuesTimeout);
                     delete thisRef._updateValuesTimeout;
 
-                    if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@value", this)) {
+                    if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@value", thisRef)) {
                         prevValue = thisRef._value;
                         if (thisRef.value !== prevValue) {
                             thisRef.dispatchEvent(MutableEvent.changeEventForKeyAndValue("value" , prevValue).withPlusValue(thisRef.value));
                         }
                     }
-                    if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@textValue", this)) {
+                    if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@textValue", thisRef)) {
                         prevValue = thisRef._textValue;
                         if (thisRef.textValue !== prevValue) {
                             thisRef.dispatchEvent(MutableEvent.changeEventForKeyAndValue("textValue" , prevValue).withPlusValue(thisRef.textValue));