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, 0 insertions, 2 deletions

diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index 1340a18f..97344b1e 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -204,14 +204,12 @@
     background:$color-stage;
     height:15px;
     margin-bottom: 0px;
-    display:none;
 }
 
 #rulerLeft {
     // TODO: temporary background please replace when component is implemented
     background:$color-stage;
     width:16px;
-    display:none;
 }
 
 #stateBar {