Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/components/tools-properties/brush-properties.reel/brush-properties.html
	js/components/tools-properties/fill-properties.reel/fill-properties.html
	js/components/tools-properties/pen-properties.reel/pen-properties.html
	js/components/tools-properties/pencil-properties.reel/pencil-properties.html
	js/components/tools-properties/selection-properties.reel/selection-properties.html
	js/components/tools-properties/shape-properties.reel/shape-properties.html
	js/components/tools-properties/tag-properties.reel/tag-properties.html
	js/components/tools-properties/text-properties.reel/text-properties.html

1 files changed, 6 insertions, 4 deletions

diff --git a/node_modules/montage/montage.js b/node_modules/montage/montage.js
index 05e1a52a..a174f50b 100755
--- a/node_modules/montage/montage.js
+++ b/node_modules/montage/montage.js
@@ -55,7 +55,7 @@ if (typeof window !== "undefined") {
         var platform = exports.getPlatform();
 
         // Platform dependent
-        platform.bootstrap(function (Require, Promise, URL) {
+        platform.bootstrap(function (Require, Promise, URL, Clock) {
             var params = platform.getParams();
             var config = platform.getConfig();
 
@@ -85,7 +85,8 @@ if (typeof window !== "undefined") {
             Require.loadPackage(montageLocation, config)
             .then(function (montageRequire) {
                 montageRequire.inject("core/promise", Promise);
-                montageRequire.inject("core/shim/timers", {});
+                montageRequire.inject("core/next-tick", Clock);
+                montageRequire.inject("core/mini-url", URL);
 
                 // install the linter, which loads on the first error
                 config.lint = function (module) {
@@ -311,7 +312,7 @@ if (typeof window !== "undefined") {
         },
 
         bootstrap: function (callback) {
-            var base, Require, DOM, Promise, URL;
+            var base, Require, DOM, Promise, URL, Clock;
 
             var params = this.getParams();
 
@@ -382,6 +383,7 @@ if (typeof window !== "undefined") {
 
             // execute bootstrap scripts
             function allModulesLoaded() {
+                Clock = bootRequire("core/next-tick");
                 Promise = bootRequire("core/promise");
                 URL = bootRequire("core/mini-url");
                 Require = bootRequire("require/require");
@@ -391,7 +393,7 @@ if (typeof window !== "undefined") {
 
             function callbackIfReady() {
                 if (DOM && Require) {
-                    callback(Require, Promise, URL);
+                    callback(Require, Promise, URL, Clock);
                 }
             }