Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/tools/SelectionTool.js

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

1 files changed, 2 insertions, 2 deletions

diff --git a/js/mediators/mouse-mediator.js b/js/mediators/mouse-mediator.js
index cef6c6c4..4d1fb62a 100755
--- a/js/mediators/mouse-mediator.js
+++ b/js/mediators/mouse-mediator.js
@@ -5,9 +5,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-    NJComponent = require("js/lib/nj-base").NJComponent;
+    Component = require("montage/ui/component").Component;
 
-exports.MouseMediator = Montage.create( NJComponent, {
+exports.MouseMediator = Montage.create(Component, {
     hasTemplate: {
         value: false
     },