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

Conflicts:
	js/controllers/document-controller.js

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

1 files changed, 2 insertions, 2 deletions

diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index 31f40d09..dc9980f0 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -98,9 +98,9 @@ exports.StageView = Montage.create(Component, {
                        onChange: function(){
                            var historySize = doc.editor.historySize();
                            if(historySize.undo>0){
-                                doc.markEdited();
+                                doc.needsSave = true;
                            }else if(historySize.undo===0 && historySize.redo>0){
-                               doc.markUnedited();
+                               doc.needsSave = false;
                            }
                        },
                        onCursorActivity: function() {