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, 5 insertions, 1 deletions

diff --git a/node_modules/components-data/number-input.json b/node_modules/components-data/number-input.json
index d446fc37..5e53fe58 100644
--- a/node_modules/components-data/number-input.json
+++ b/node_modules/components-data/number-input.json
@@ -6,7 +6,11 @@
     "name": "NumberInput",
 
     "properties": [
-
+        {
+            "name": "value",
+            "type": "number",
+            "default": null
+        },
         {
             "name": "min",
             "type": "number",