Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/hintable.reel/hintable.js

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

1 files changed, 2 insertions, 1 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index 716ee3d3..d4789d65 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -48,7 +48,7 @@
     position:absolute;
 }
 .tl_leftpane{
-    min-width: 200px;
+    min-width: 210px;
     max-width: 500px;
     position: relative;
     overflow: hidden;
@@ -310,6 +310,7 @@
     background: none;
     float:left;
     margin-left: 5%;
+    visibility: hidden;
 }
 
 /* Configuration menu */