Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

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

2 files changed, 4 insertions, 4 deletions

diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index a737bd39..72984c17 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -11,21 +11,21 @@
         <script type="text/montage-serialization">
         {
             "elementName": {
-                "prototype": "montage/ui/textfield.reel",
+                "prototype": "montage/ui/native/input-text.reel",
                 "properties": {
                     "element": {"#": "elementName"}
                 }
             },
 
             "elementId": {
-                "prototype": "montage/ui/textfield.reel",
+                "prototype": "montage/ui/native/input-text.reel",
                 "properties": {
                     "element": {"#": "elementId"}
                 }
             },
 
             "elementClass": {
-                "prototype": "montage/ui/textfield.reel",
+                "prototype": "montage/ui/native/input-text.reel",
                 "properties": {
                     "element": {"#": "elementClass"}
                 }
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
index 572e5a60..259e9ab5 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
@@ -232,7 +232,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             }
         },
         "flattenCheckbox": {
-            "prototype": "montage/ui/checkbox.reel",
+            "prototype": "montage/ui/input-checkbox.reel",
             "properties": {
                 "element": {"#": "flattenCh"},
                 "identifier": "flatten",