Merge branch 'timeline-local' into timeline-multiselect

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	resolved using theirs. (selectLayers)

1 files changed, 2 insertions, 2 deletions

diff --git a/js/components/popup-manager.reel/popup-manager.js b/js/components/popup-manager.reel/popup-manager.js
index fbcd5035..cf818b4e 100755
--- a/js/components/popup-manager.reel/popup-manager.js
+++ b/js/components/popup-manager.reel/popup-manager.js
@@ -10,8 +10,8 @@ var Montage = 			require("montage/core/core").Montage,
         Component =             require("montage/ui/component").Component,
         Popup =                         require("js/components/popup.reel").Popup;
 ////////////////////////////////////////////////////////////////////////
-//Exporting as PopupMananger
-exports.PopupMananger = Montage.create(Component, {
+//Exporting as PopupManager
+exports.PopupManager = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
         //
     deserializedFromTemplate: {