Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/node_modules/montage/ui/application.js b/node_modules/montage/ui/application.js
index 7cb4bd97..bbce6835 100755
--- a/node_modules/montage/ui/application.js
+++ b/node_modules/montage/ui/application.js
@@ -169,7 +169,7 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta
     _zIndex: {value: null},
 
     _isSystemPopup: {value: function(type) {
-        return (type === 'alert' || type === 'confirm' || type === 'loading');
+        return (type === 'alert' || type === 'confirm' || type === 'notify');
     }},
 
     _createPopupSlot: {value: function(zIndex) {
@@ -201,7 +201,7 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta
                         case "confirm":
                             zIndex = 9003;
                             break;
-                        case "loading":
+                        case "notify":
                             zIndex = 9002;
                             break;
                     }