Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

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

1 files changed, 6 insertions, 0 deletions

diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css
index f5b00e84..58b7e02d 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.css
@@ -13,8 +13,14 @@
 
 .montage-editor {
     position: relative;
+    height: inherit;
     outline:  none;
     overflow: auto;
+
+    -webkit-user-select: text;
+    -moz-user-select: text;
+    -ms-user-select: text;
+    user-select: text;
 }
 
 /*