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, 13 deletions

diff --git a/node_modules/montage/core/core.js b/node_modules/montage/core/core.js
index 26733c94..9109b772 100755
--- a/node_modules/montage/core/core.js
+++ b/node_modules/montage/core/core.js
@@ -635,16 +635,4 @@ Object.defineProperty(Montage, "callDelegateMethod", {
             return delegateFunction.apply(delegate, arguments);
         }
     }
-});
-
-// XXX Does not presently function server-side
-if (typeof window !== "undefined") {
-
-    var EventManager = require("core/event/event-manager").EventManager;
-    EventManager.create().initWithWindow(window);
-
-    // Now that we have a defaultEventManager we can setup the bindings system
-    require("core/event/binding");
-
-}
-
+});
\ No newline at end of file