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

Conflicts:
	js/document/html-document.js
	js/helper-classes/3D/snap-manager.js

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

1 files changed, 2 insertions, 2 deletions

diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 887743c5..e16715a4 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -113,8 +113,8 @@ exports.NJUtils = Object.create(Object.prototype, {
     },
 
     ///// Element Model creation for existing elements based on element type.
-    ///// TODO: find a different place for this function and return different element models based on type.
-    makeElementModel2: {
+    ///// TODO: Selection and model should be based on the element type
+    makeModelFromElement: {
         value: function(el) {
             this.makeElementModel(el, "Div", "block", false);
         }