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, 1 insertions, 1 deletions

diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js
index 71169d00..0bdf67e7 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js
@@ -593,7 +593,7 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
                         editorInnerElement.appendChild(contents);
                         contentChanged = true;
                     } else {
-                        for (i = 0; (content = contents[i]); i++) {
+                        for (i = 0; contents && (content = contents[i]); i++) {
                             editorInnerElement.appendChild(content);
                             contentChanged = true;
                         }