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, 3 insertions, 3 deletions

diff --git a/node_modules/montage/ui/token-field/token.reel/token.html b/node_modules/montage/ui/token-field/token.reel/token.html
index 54ba266e..c478ef0c 100644
--- a/node_modules/montage/ui/token-field/token.reel/token.html
+++ b/node_modules/montage/ui/token-field/token.reel/token.html
@@ -9,7 +9,7 @@
 {
 
     "tokenText": {
-        "prototype": "montage/ui/dynamic-text.reel",
+        "prototype": "ui/dynamic-text.reel",
         "properties": {
             "element": {"#": "token-text"}            
         },
@@ -18,7 +18,7 @@
         }
     },
     "tokenDelete": {
-        "prototype": "montage/ui/dynamic-text.reel",
+        "prototype": "ui/dynamic-text.reel",
         "properties": {
             "element": {"#": "token-delete"},
             "value": "✕"
@@ -26,7 +26,7 @@
     },
 
     "owner": {
-        "prototype": "montage/ui/token-field/token.reel",
+        "prototype": "ui/token-field/token.reel",
         "properties": {
             "element": {"#": "token"},
             "_deleteEl": {"#": "token-delete"}