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, 5 insertions, 6 deletions

diff --git a/node_modules/montage/ui/loading-panel.reel/loading-panel.html b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
index d1f8078e..c434f80f 100755
--- a/node_modules/montage/ui/loading-panel.reel/loading-panel.html
+++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
@@ -14,17 +14,16 @@
     <script type="text/montage-serialization">{
 
             "owner": {
-                "prototype": "montage/ui/loading-panel.reel",
+                "prototype": "ui/loading-panel.reel",
                 "properties": {
                     "element": {"#": "loadingPanel"}
                 }
             },
 
             "loadingIndicator": {
-                "prototype": "montage/ui/bluemoon/progress.reel",
+                "prototype": "ui/bluemoon/progress.reel",
                 "properties": {
-                    "element": {"#": "loadingIndicator"},
-                    "loading": true
+                    "element": {"#": "loadingIndicator"}
                 },
                 "bindings": {
                     "value": {"<-": "@owner.initializedModuleCount"},
@@ -33,7 +32,7 @@
             },
 
             "loadedCount": {
-                "prototype": "montage/ui/dynamic-text.reel",
+                "prototype": "ui/dynamic-text.reel",
                 "properties": {
                     "element": {"#": "loadedCount"}
                 },
@@ -43,7 +42,7 @@
             },
 
              "requiredCount": {
-                "prototype": "montage/ui/dynamic-text.reel",
+                "prototype": "ui/dynamic-text.reel",
                 "properties": {
                     "element": {"#": "requiredCount"}
                 },