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, 8 insertions, 8 deletions

diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index e4cd69b8..38b317e2 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -75,7 +75,7 @@
                 }
             }
         }
-        </script>
+            </script>
 
     </head>
 
@@ -85,14 +85,14 @@
             <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div>
             <div class="nj-divider divider-vertical">&nbsp;</div>
             <label class="label"> Width:</label>
-            <div id="strokeSize" class="label"></div>
+            <div data-montage-id="strokeSize" class="label"></div>
             <label class="label"> Hardness:</label>
-            <div id="strokeHardness" class="label"></div>
-            <input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="nj-skinned"/><label class="label">Smoothing</label>
-            <div id="smoothingAmount" class="label"></div>
-            <input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="nj-skinned"/><label class="label">Calligraphic</label>
-            <label class="label" id="angleLabel">Angle:</label>
-            <div id="strokeAngle" class="label"></div>
+            <div data-montage-id="strokeHardness" class="label"></div>
+            <input data-montage-id="doSmoothing" type="checkbox" name="doSmoothingControl" class="nj-skinned"/><label class="label">Smoothing</label>
+            <div data-montage-id="smoothingAmount" class="label"></div>
+            <input data-montage-id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="nj-skinned"/><label class="label">Calligraphic</label>
+            <label data-montage-id="angleLabel class="label"">Angle:</label>
+            <div data-montage-id="strokeAngle" class="label"></div>
         </div>
     </body>