Update latex makefile template
Merge branch 'master' into zaalbar