Merge branch 'master' into pentool

Conflicts:
	manifest.json

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);
         }