Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/node_modules/tools/template/template-creator.js b/node_modules/tools/template/template-creator.js
index c5d3cffd..646c4171 100755
--- a/node_modules/tools/template/template-creator.js
+++ b/node_modules/tools/template/template-creator.js
@@ -57,6 +57,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
                     component._element = targetNode;
                     components[label] = component;
                     componentsChildComponents[label] = component.childComponents;
+                    component._element.setAttribute('data-ninja-node', 'true');
                     delete component.childComponents;
                 } else {
                     for (var i = 0; (childNode = childNodes[i]); i++) {