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

diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index 9bae188e..446b0a02 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -34,7 +34,7 @@
                 }
             }
         }
-        </script>
+            </script>
        
     </head>
 
@@ -45,9 +45,9 @@
         <div class="colorCtrlIcon FillTool"></div>
         <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div>
         <div class="nj-divider divider-vertical">&nbsp;</div>
-        <label class="label"> Stroke:</label>
-        <div id="strokeSize" class="label"></div>
-    </div>
+            <label class="label"> Stroke:</label>
+            <div data-montage-id="strokeSize" class="label"></div>
+        </div>
     </body>
 
 </html>
\ No newline at end of file