Merge branch 'refs/heads/master' into binding

Conflicts:
	js/document/models/html.js
	js/document/views/design.js
	js/ninja.reel/ninja.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

3 files changed, 2 insertions, 20 deletions

diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index 5e8ca527..0676cac1 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -18,6 +18,7 @@
             "possibleValues": ["animation", "timer"]
         }
     ],
+
     "defaultStyles":  {
         "width":"380px",
         "height":"120px"
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
index b0711b12..4ab329e5 100644
--- a/node_modules/components-data/picasa-carousel.json
+++ b/node_modules/components-data/picasa-carousel.json
@@ -12,6 +12,7 @@
             "default": ""
         }
     ],
+
     "defaultStyles":  {
         "width":"800px",
         "height":"160px",
diff --git a/node_modules/components-data/searchfield.json b/node_modules/components-data/searchfield.json
deleted file mode 100644
index 94c570d9..00000000
--- a/node_modules/components-data/searchfield.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "component": "searchfield",
-
-    "module": "montage/ui/textfield.reel",
-
-    "name": "Textfield",
-
-    "properties": [
-        {
-            "name": "valueBinding",
-            "type": "string",
-            "default": null
-        },
-        {
-            "name": "value",
-            "type": "string",
-            "default": ""
-        }
-    ]
-}
\ No newline at end of file