Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/document/document-html.js
	js/document/templates/app/main.js
	js/panels/Panel.reel/Panel.js
	node_modules/montage/ui/native-control.js

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

1 files changed, 4 insertions, 4 deletions

diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.html b/node_modules/montage/ui/popup/confirm.reel/confirm.html
index 3e256b0e..1c9b7caf 100755
--- a/node_modules/montage/ui/popup/confirm.reel/confirm.html
+++ b/node_modules/montage/ui/popup/confirm.reel/confirm.html
@@ -11,7 +11,7 @@
         <script type="text/montage-serialization">{
 
     "dynamictext1": {
-        "prototype": "montage/ui/dynamic-text.reel",
+        "prototype": "ui/dynamic-text.reel",
         "properties": {
             "element": {
                 "#": "msg"
@@ -22,7 +22,7 @@
         }
     },
     "button1": {
-        "prototype": "montage/ui/bluemoon/button.reel",
+        "prototype": "ui/bluemoon/button.reel",
         "properties": {
             "identifier": "Ok",
             "element": {
@@ -42,7 +42,7 @@
         ]
     },
     "button2": {
-        "prototype": "montage/ui/bluemoon/button.reel",
+        "prototype": "ui/bluemoon/button.reel",
         "properties": {
             "identifier": "Cancel",
             "element": {
@@ -62,7 +62,7 @@
         ]
     },
     "owner": {
-        "prototype": "montage/ui/popup/confirm.reel",
+        "prototype": "ui/popup/confirm.reel",
         "properties": {
             "element": {
                 "#": "confirm-container"