Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

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

1 files changed, 0 insertions, 14 deletions

diff --git a/node_modules/montage/ui/substitution.reel/substitution.js b/node_modules/montage/ui/substitution.reel/substitution.js
index ad4034c1..bf3ddcaa 100755
--- a/node_modules/montage/ui/substitution.reel/substitution.js
+++ b/node_modules/montage/ui/substitution.reel/substitution.js
@@ -73,19 +73,5 @@ exports.Substitution = Montage.create(Slot, /** @lends module:"montage/ui/substi
     transition: {
         enumerable: false,
         value: null
-    },
-/**
-    Description TODO
-    @function
-    */
-    prepareForDraw: {
-        enumerable: false,
-        value: function() {
-
-            if (this.switchComponents) {
-                this.content = this.switchComponents[this.switchValue];
-            }
-        }
     }
-
 });