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, 6 insertions, 17 deletions

diff --git a/node_modules/components-data/textarea.json b/node_modules/components-data/textarea.json
index 6e3d78c2..0dd7714e 100644
--- a/node_modules/components-data/textarea.json
+++ b/node_modules/components-data/textarea.json
@@ -3,30 +3,19 @@
 
     "module": "montage/ui/textarea.reel",
 
-    "name": "TextArea",
+    "name": "Textarea",
 
     "properties": [
 
         {
-            "name": "rows",
-            "type": "number",
-            "default": null
-        },
-        {
-            "name": "cols",
-            "type": "number",
-            "default": null
-        },
-        {
-            "name": "wrap",
-            "type": "string",
-            "default": "soft",
-            "possibleValues": ["hard", "soft"]
-        },
-        {
             "name": "textContent",
             "type": "string",
             "default": null
+        },
+        {
+            "name": "disabled",
+            "type": "boolean",
+            "default": false
         }
     ]
 }
\ No newline at end of file