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/list.reel/list.html b/node_modules/montage/ui/list.reel/list.html
index 25027bcb..f0d648c0 100755
--- a/node_modules/montage/ui/list.reel/list.html
+++ b/node_modules/montage/ui/list.reel/list.html
@@ -10,7 +10,7 @@
     <script type="text/montage-serialization">{
 
     "repetition1": {
-        "prototype": "montage/ui/repetition.reel",
+        "prototype": "ui/repetition.reel",
         "properties": {
             "element": {
                 "#": "repetition"
@@ -24,7 +24,7 @@
         }
     },
     "scroller1": {
-        "prototype": "montage/ui/scroller.reel",
+        "prototype": "ui/scroller.reel",
         "properties": {
             "element": {
                 "#": "scroller"
@@ -35,7 +35,7 @@
         }
     },
     "owner": {
-        "prototype": "montage/ui/list.reel",
+        "prototype": "ui/list.reel",
         "properties": {
             "element": {
                 "#": "EA5D3E95-BA4E-4696-BBBE-B4DE2F6ED6C9"