Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

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

10 files changed, 16 insertions, 16 deletions

diff --git a/node_modules/components-data/anchor.json b/node_modules/components-data/anchor.json
index 028a759b..e3847374 100644
--- a/node_modules/components-data/anchor.json
+++ b/node_modules/components-data/anchor.json
@@ -1,7 +1,7 @@
 {
     "component": "anchor",
 
-    "module": "montage/ui/anchor.reel",
+    "module": "montage/ui/native/anchor.reel",
 
     "name": "Anchor",
 
diff --git a/node_modules/components-data/button.json b/node_modules/components-data/button.json
index a931afcb..73ed2c9c 100644
--- a/node_modules/components-data/button.json
+++ b/node_modules/components-data/button.json
@@ -1,7 +1,7 @@
 {
     "component": "button",
 
-    "module": "montage/ui/button.reel",
+    "module": "montage/ui/native/button.reel",
 
     "name": "Button",
 
diff --git a/node_modules/components-data/checkbox.json b/node_modules/components-data/checkbox.json
index cd851f67..58f09cb6 100644
--- a/node_modules/components-data/checkbox.json
+++ b/node_modules/components-data/checkbox.json
@@ -1,9 +1,9 @@
 {
     "component": "checkbox",
 
-    "module": "montage/ui/checkbox.reel",
+    "module": "montage/ui/native/input-checkbox.reel",
 
-    "name": "Checkbox",
+    "name": "InputCheckbox",
 
     "properties": [
 
diff --git a/node_modules/components-data/image.json b/node_modules/components-data/image.json
index 22548cf9..3dee2365 100644
--- a/node_modules/components-data/image.json
+++ b/node_modules/components-data/image.json
@@ -1,7 +1,7 @@
 {
     "component": "imageComponent",
 
-    "module": "montage/ui/image.reel",
+    "module": "montage/ui/native/image.reel",
 
     "name": "Image",
 
diff --git a/node_modules/components-data/number-input.json b/node_modules/components-data/number-input.json
index 5e53fe58..521b4921 100644
--- a/node_modules/components-data/number-input.json
+++ b/node_modules/components-data/number-input.json
@@ -1,9 +1,9 @@
 {
     "component": "numberInput",
 
-    "module": "montage/ui/number-input.reel",
+    "module": "montage/ui/native/input-number.reel",
 
-    "name": "NumberInput",
+    "name": "InputNumber",
 
     "properties": [
         {
diff --git a/node_modules/components-data/radio-button.json b/node_modules/components-data/radio-button.json
index df0893ad..5a771c97 100644
--- a/node_modules/components-data/radio-button.json
+++ b/node_modules/components-data/radio-button.json
@@ -1,9 +1,9 @@
 {
     "component": "radioButton",
 
-    "module": "montage/ui/radio-button.reel",
+    "module": "montage/ui/native/input-radio.reel",
 
-    "name": "RadioButton",
+    "name": "InputRadio",
 
     "properties": [
         {
diff --git a/node_modules/components-data/range-input.json b/node_modules/components-data/range-input.json
index 1f3f5b20..23f9b070 100644
--- a/node_modules/components-data/range-input.json
+++ b/node_modules/components-data/range-input.json
@@ -1,9 +1,9 @@
 {
     "component": "rangeInput",
 
-    "module": "montage/ui/range-input.reel",
+    "module": "montage/ui/native/input-range.reel",
 
-    "name": "RangeInput",
+    "name": "InputRange",
 
     "properties": [
         {
diff --git a/node_modules/components-data/select.json b/node_modules/components-data/select.json
index 33849fb6..123b935f 100644
--- a/node_modules/components-data/select.json
+++ b/node_modules/components-data/select.json
@@ -1,9 +1,9 @@
 {
     "component": "select",
 
-    "module": "montage/ui/select-input.reel",
+    "module": "montage/ui/native/select.reel",
 
-    "name": "SelectInput",
+    "name": "Select",
 
     "properties": [
     ]
diff --git a/node_modules/components-data/textarea.json b/node_modules/components-data/textarea.json
index 0dd7714e..15cdf8ad 100644
--- a/node_modules/components-data/textarea.json
+++ b/node_modules/components-data/textarea.json
@@ -1,7 +1,7 @@
 {
     "component": "textarea",
 
-    "module": "montage/ui/textarea.reel",
+    "module": "montage/ui/native/textarea.reel",
 
     "name": "Textarea",
 
diff --git a/node_modules/components-data/textfield.json b/node_modules/components-data/textfield.json
index cb3f1c8f..d82723b7 100644
--- a/node_modules/components-data/textfield.json
+++ b/node_modules/components-data/textfield.json
@@ -1,9 +1,9 @@
 {
     "component": "textfield",
 
-    "module": "montage/ui/textfield.reel",
+    "module": "montage/ui/native/input-text.reel",
 
-    "name": "Textfield",
+    "name": "InputText",
 
     "properties": [
         {