Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/node_modules/montage/require/browser.js b/node_modules/montage/require/browser.js
index a6a8af5a..1b4029ad 100755
--- a/node_modules/montage/require/browser.js
+++ b/node_modules/montage/require/browser.js
@@ -17,7 +17,7 @@ Require.getLocation = function() {
     return URL.resolve(window.location, ".");
 };
 
-Require.overlays = ["browser", "montage"];
+Require.overlays = ["window", "browser", "montage"];
 
 // Due to crazy variabile availability of new and old XHR APIs across
 // platforms, this implementation registers every known name for the event
@@ -116,8 +116,6 @@ Require.Compiler = function (config) {
         // module.factory = new Function("require", "exports", "module", module.text + "\n//*/"+sourceURLComment);
 
         module.factory.displayName = displayName;
-
-        return module;
     }
 };