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, 2 deletions

diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index ed92b893..8b644d4a 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -224,10 +224,11 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
     HandleDoubleClick: {
         value: function(event) {
             if(this.application.ninja.selectedElements.length > 0) {
-                this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0];
+                this.application.ninja.currentDocument.model.domContainer = this.application.ninja.selectedElements[0];
             } else {
-                this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.model.documentRoot;
+                this.application.ninja.currentDocument.model.domContainer = this.application.ninja.currentDocument.model.documentRoot;
             }
+            this.application.ninja.selectionController.executeSelectElement();
         }
     },