Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 32 insertions, 0 deletions

diff --git a/node_modules/components-data/textarea.json b/node_modules/components-data/textarea.json
new file mode 100644
index 00000000..6e3d78c2
--- /dev/null
+++ b/node_modules/components-data/textarea.json
@@ -0,0 +1,32 @@
+{
+    "component": "textarea",
+
+    "module": "montage/ui/textarea.reel",
+
+    "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
+        }
+    ]
+}
\ No newline at end of file