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

server-ce/Dockerfile

@@ -88,7 +88,7 @@ ADD ${baseDir}/nginx/sharelatex.conf /etc/nginx/sites-enabled/sharelatex.conf
 RUN rm -r /install-tl-unx; \
 	rm install-tl-unx.tar.gz
 
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/texlive/2015/bin/x86_64-linux/
+ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/texlive/2016/bin/x86_64-linux/
 RUN apt-get update
 RUN tlmgr install latexmk
 

server-ce/settings.coffee

@@ -136,6 +136,14 @@ settings =
 	# address and http/https protocol information.
 	behindProxy: process.env["SHARELATEX_BEHIND_PROXY"] or false
 
+	if process.env["SHARELATEX_LEFT_FOOTER"]
+		left_footer: process.env["SHARELATEX_LEFT_FOOTER"]
+
+	if process.env["SHARELATEX_RIGHT_FOOTER"]
+		right_footer: process.env["SHARELATEX_RIGHT_FOOTER"]
+
+	if process.env["SHARELATEX_HEADER"]
+		header: process.env["SHARELATEX_HEADER"]
 
 	# Spell Check Languages
 	# ---------------------