Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

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

1 files changed, 3 insertions, 3 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"}
                 }