Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/node_modules/montage/ui/toggle-button.reel/toggle-button.js b/node_modules/montage/ui/toggle-button.reel/toggle-button.js
index f8f3c0fa..518a4d74 100644
--- a/node_modules/montage/ui/toggle-button.reel/toggle-button.js
+++ b/node_modules/montage/ui/toggle-button.reel/toggle-button.js
@@ -124,9 +124,9 @@ var ToggleButton = exports.ToggleButton = Montage.create(Button, {
       }
     },
 
-    deserializedFromTemplate: {
+    didSetElement: {
         value: function() {
-            Object.getPrototypeOf(ToggleButton).deserializedFromTemplate.call(this);
+            Object.getPrototypeOf(ToggleButton).didSetElement.call(this);
 
             // If we haven't set the (un)pressedLabel of the initial state,
             // then take it from the label