Merge branch 'refs/heads/ToolFixes' into WebGLMaterials

Conflicts:
	js/document/templates/montage-html/default_html.css
	js/mediators/element-mediator.js
	js/panels/properties.reel/properties.js
	js/tools/BrushTool.js
	js/tools/LineTool.js
	js/tools/PenTool.js
	js/tools/SelectionTool.js
	js/tools/ShapeTool.js
	js/tools/TranslateObject3DTool.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 0 insertions, 7 deletions

diff --git a/js/models/shape-model.js b/js/models/shape-model.js
index ea8c2cfc..ff69ae3c 100755
--- a/js/models/shape-model.js
+++ b/js/models/shape-model.js
@@ -17,15 +17,8 @@ exports.ShapeModel = Montage.create(Component, {
     GLGeomObj:              { value: null },
 
     strokeSize:             { value: null },
-    stroke:                 { value: null },
-    strokeMaterial:         { value: null },
     strokeStyle:            { value: null },
     strokeStyleIndex:       { value: null },
-    border:                 { value: null },    // Store css value for ColorController
-
-    fill:                   { value: null },
-    fillMaterial:           { value: null },
-    background:             { value: null },    // Store css value for ColorController
 
     // Line-specific
     slope:                  { value: null },