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>

2 files changed, 6 insertions, 0 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 40e94cca..611cf214 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -84,6 +84,7 @@ exports.ElementMediator = Montage.create(Component, {
         value: function(newChild, oldChild, notify) {
 
             this.application.ninja.currentDocument.model.documentRoot.replaceChild(newChild, oldChild);
+            if (newChild.getAttribute) newChild.setAttribute('data-ninja-node', 'true');
 
             var undoLabel = "replace element";
 
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 4fd4bd4c..196c8a4b 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -56,6 +56,11 @@ var Keyboard = exports.Keyboard = {
 
 exports.KeyboardMediator = Montage.create(Component, {
 
+    appModel: {
+        value: null,
+        serializable: true
+    },
+
     deserializedFromTemplate: {
         value: function() {
             this.eventManager.addEventListener("appLoaded", this, false);