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, 11 deletions

diff --git a/node_modules/components-data/select.json b/node_modules/components-data/select.json
index b823f8d6..33849fb6 100644
--- a/node_modules/components-data/select.json
+++ b/node_modules/components-data/select.json
@@ -6,16 +6,5 @@
     "name": "SelectInput",
 
     "properties": [
-
-        {
-            "name": "label",
-            "type": "string",
-            "default": "Button"
-        },
-        {
-            "name": "enabled",
-            "type": "boolean",
-            "default": "true"
-        }
     ]
 }
\ No newline at end of file