Merge branch 'master' into brushtool

1 files changed, 4 insertions, 2 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 27825a09..ff1677ea 100755
--- a/node_modules/montage/ui/loading-panel.reel/loading-panel.html
+++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
@@ -34,7 +34,7 @@
                         "boundObjectPropertyPath": "initializedModuleCount",
                         "oneway": true
                     },
-                    "maximumValue": {
+                    "max": {
                         "boundObject": {"@": "owner"},
                         "boundObjectPropertyPath": "requiredModuleCount",
                         "oneway": true
@@ -81,7 +81,9 @@
     <div id="loadingPanel" class="montage-loading-panel">
         <div id="loadingIndicator" class="loadingIndicator"></div>
         <div id="loadingCount" class="loadingCount">
-            <span id="loadedCount" class="loadedCount">0</span><span class="divider">/</span><span id="requiredCount" class="requiredCount">0</span>
+            <span id="loadedCount" class="loadedCount">0</span>
+            <span class="divider">/</span>
+            <span id="requiredCount" class="requiredCount">0</span>
         </div>
     </div>