Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

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

1 files changed, 1 insertions, 1 deletions

diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 4ccb7a8d..29e9b99f 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -66,7 +66,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                 var canvas;
                 if(!this._useExistingCanvas())
                 {
-                    canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", null, true);
+                    canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
                     var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height,
                                                                         drawData.planeMat, drawData.midPt, canvas);