Merge branch 'refs/heads/ninja-internal-master' into bugfix-master

Conflicts:
	js/ninja.reel/ninja.html

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

1 files changed, 1 insertions, 1 deletions

diff --git a/node_modules/tools/template/template-creator.js b/node_modules/tools/template/template-creator.js
index 646c4171..7cc66093 100755
--- a/node_modules/tools/template/template-creator.js
+++ b/node_modules/tools/template/template-creator.js
@@ -105,7 +105,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
 
     _generateLabelForComponent: {value: function(component, labels) {
         var componentInfo = Montage.getInfoForObject(component),
-            componentLabel = componentInfo.label,
+            componentLabel = componentInfo.label || component.identifier,
             componentName,
             index;