Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

Conflicts:
	js/io/document/document-controller.js
	js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
	js/io/ui/save-as-dialog.reel/save-as-dialog.js

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

1 files changed, 0 insertions, 1 deletions

diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index 6fc34911..cd895102 100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
@@ -10,7 +10,6 @@ var Component = require("montage/ui/component").Component;
 var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
 var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
 var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
-var Properties3D = require("js/helper-classes/Properties3D").Properties3D;
 var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils;
 
 exports.DrawingToolBase = Montage.create(Montage, {