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

services/web/app/views/templates/template.jade

@@ -28,20 +28,17 @@ block content
 						.template-details-section
 							h3 #{translate("about")}
 							div !{template.description}
-							div(ng-controller="openInSlController").download-buttons
+							div(ng-controller="openInSlController", ng-cloak).download-buttons
 								a.btn.btn-primary.btn-large(href=template.open_in_sharelatex_url, ng-click='open()', ng-disabled="isDisabled", rel='nofollow') {{openInSlText}}
 								|  
 
 								a.btn.btn-default(
-									href=template.zipUrl, 
+									href=template.zipUrl,
 									rel='nofollow', 
-									ng-click='downloadZip()', 
-									data-toggle="tooltip", 
-									data-placement="bottom", 
-									title="", 
-									data-original-title="Download .zip File"
+									ng-click='downloadZip()',
+									tooltip-placement="bottom",
+									tooltip="Download .zip File"
 								)
-
 									i.fa.fa-cloud-download
 						.template-details-section.social_buttons
 							.addthis_toolbox.addthis_default_style.addthis_32x32_style

services/web/public/coffee/ide/editor/directives/aceEditor/highlights/HighlightsManager.coffee

@@ -216,7 +216,7 @@ define [
 			@_addMarkerWithCustomStyle(
 				new Range(
 					annotation.highlight.start.row, annotation.highlight.start.column,
-					annotation.highlight.end.row,   annotation.highlight.end.column + 1
+					annotation.highlight.end.row,   annotation.highlight.end.column
 				),
 				"annotation highlight",
 				false,
@@ -228,7 +228,7 @@ define [
 			@_addMarkerWithCustomStyle(
 				new Range(
 					annotation.strikeThrough.start.row, annotation.strikeThrough.start.column,
-					annotation.strikeThrough.end.row,   annotation.strikeThrough.end.column + 1
+					annotation.strikeThrough.end.row,   annotation.strikeThrough.end.column
 				),
 				"annotation strike-through-background",
 				false,
@@ -237,7 +237,7 @@ define [
 			@_addMarkerWithCustomStyle(
 				new Range(
 					annotation.strikeThrough.start.row, annotation.strikeThrough.start.column,
-					annotation.strikeThrough.end.row,   annotation.strikeThrough.end.column + 1
+					annotation.strikeThrough.end.row,   annotation.strikeThrough.end.column
 				),
 				"annotation strike-through-foreground",
 				true,