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

services/web/app/views/project/list/project-list.jade

@@ -165,7 +165,7 @@
 							small #{translate("no_projects")}
 			div.welcome.text-centered(ng-if="projects.length == 0", ng-cloak)
 				h2 #{translate("welcome_to_sl")}
-				p #{translate("new_to_latex_look_at")}
+				p #{translate("new_to_latex_look_at")} 
 					a(href="/templates") #{translate("templates").toLowerCase()}
 					|   #{translate("or")}
 					a(href="/learn")  #{translate("latex_help_guide")}

services/web/config/settings.defaults.coffee

@@ -100,7 +100,7 @@ module.exports =
 	# that are sent out, generated links, etc.
 	siteUrl : siteUrl = 'http://localhost:3000'
 
-	# cooke domain
+	# cookie domain
 	# use full domain for cookies to only be accesabble from that domain,
 	# replace subdomain with dot to have them accessable on all subdomains
 	# cookieDomain: ".sharelatex.dev"