Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign

services/web/app/views/project/editor.jade

@@ -61,7 +61,7 @@ block content
 						include ./editor/track-changes
 
 			.ui-layout-east
-				include ./editor/chat
+				//- include ./editor/chat
 
 	script(type="text/ng-template", id="genericMessageModalTemplate")
 		.modal-header

services/web/app/views/project/editor/header.jade

@@ -50,12 +50,12 @@ header.toolbar.toolbar-header(ng-cloak, ng-hide="state.loading")
 			tooltip-placement="bottom"
 		)
 			i.fa.fa-fw.fa-history
-		a.btn.btn-full-height(
-			href,
-			tooltip="Chat",
-			tooltip-placement="bottom",
-			ng-class="{ active: ui.chatOpen }",
-			ng-click="toggleChat()",
-			ng-controller="ChatButtonController"
-		)
-			i.fa.fa-fw.fa-comment
+		//- a.btn.btn-full-height(
+		//- 	href,
+		//- 	tooltip="Chat",
+		//- 	tooltip-placement="bottom",
+		//- 	ng-class="{ active: ui.chatOpen }",
+		//- 	ng-click="toggleChat()",
+		//- 	ng-controller="ChatButtonController"
+		//- )
+		//- 	i.fa.fa-fw.fa-comment