Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

1 files changed, 1 insertions, 1 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index d84a6aab..1a391338 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -854,7 +854,7 @@ World.prototype.importObjectsJSON = function (jObj, parentGeomObj) {
 
         // determine if we have children
     if (jObj.children) {
-                var nKids = ojObjbj.chilodren.length;
+                var nKids = jObj.children.length;
         for (var i = 0; i < nKids; i++) {
                         var child = jObj.children[i];
                         this.importObjectsJSON( child, gObj );