Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js

1 files changed, 0 insertions, 30 deletions

diff --git a/node_modules/components-data/checkbox.json b/node_modules/components-data/checkbox.json
index a03ee00f..cd851f67 100644
--- a/node_modules/components-data/checkbox.json
+++ b/node_modules/components-data/checkbox.json
@@ -8,11 +8,6 @@
     "properties": [
 
         {
-            "name": "autofocus",
-            "type": "boolean",
-            "default": "false"
-        },
-        {
             "name": "disabled",
             "type": "boolean",
             "default": "false"
@@ -21,31 +16,6 @@
             "name": "checked",
             "type": "boolean",
             "default": "false"
-        },
-        {
-            "name": "form",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "name",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "readonly",
-            "type": "boolean",
-            "default": null
-        },
-        {
-            "name": "title",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "value",
-            "type": "string",
-            "default": "on"
         }
     ]
 }
\ No newline at end of file