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/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html
index d08453fa..4f17c0fb 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.html
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html
@@ -40,7 +40,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 }
             },
             "editButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                 "properties": {
                     "element": {"#": "edit-button"},
                     "identifier": "editButton",
@@ -53,7 +53,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
             },
             "disableButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                 "properties": {
                     "element": {"#": "disable-button"},
                     "identifier": "disableButton",
@@ -66,7 +66,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
             },
             "deleteButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                 "properties": {
                     "element": {"#": "delete-button"},
                     "identifier": "deleteButton",