Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/components/tools-properties/brush-properties.reel/brush-properties.html
	js/components/tools-properties/fill-properties.reel/fill-properties.html
	js/components/tools-properties/pen-properties.reel/pen-properties.html
	js/components/tools-properties/pencil-properties.reel/pencil-properties.html
	js/components/tools-properties/selection-properties.reel/selection-properties.html
	js/components/tools-properties/shape-properties.reel/shape-properties.html
	js/components/tools-properties/tag-properties.reel/tag-properties.html
	js/components/tools-properties/text-properties.reel/text-properties.html

1 files changed, 3 insertions, 3 deletions

diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js
index 32063d9a..1357ba67 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.js
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js
@@ -78,9 +78,9 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, {
 
     handleClick: {
         value: function(event) {
-            this.selectedElement = event._event.target.id;
+            this.selectedElement = event._event.target.value;
 
-            if(this.selectedElement === "customTool") {
+            if(this.selectedElement === "custom") {
                 this.customName.style["display"] = "";
                 this.customLabel.style["display"] = "";
             } else {
@@ -91,7 +91,7 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, {
     },
 
     _selectedElement: {
-        value: "divTool", enumerable: false
+        value: "div", enumerable: false
     },
 
     selectedElement: {