Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

1 files changed, 0 insertions, 8 deletions

diff --git a/js/controllers/undo-controller.js b/js/controllers/undo-controller.js
index 19cfb6e6..8514df3d 100755
--- a/js/controllers/undo-controller.js
+++ b/js/controllers/undo-controller.js
@@ -113,20 +113,12 @@ exports.UndoController = Montage.create( Component, {
 
     deserializedFromTemplate: {
         value: function(){
-            this.eventManager.addEventListener( "openDocument", this, false);
             this.eventManager.addEventListener( "sendToUndo", this, false);
             this.eventManager.addEventListener( "executeUndo", this, false);
             this.eventManager.addEventListener( "executeRedo", this, false);
         }
     },
 
-    handleOpenDocument: {
-        value: function(undoQueue, redoQueue) {
-//            this._undoQueue = undoQueue;
-//            this._redoQueue = redoQueue;
-        }
-    },
-
     handleSendToUndo: {
         value: function(event) {
             this.undoQueue.push(event.detail);