07/07
10/07
Merge remote-tracking branch 'origin/master'

Conflicts:
	latex/sbc-template.aux
	latex/sbc-template.log
	latex/sbc-template.pdf
	latex/sbc-template.tex