lATEX BOMBANDO....
Merge remote-tracking branch 'origin/master'

Conflicts:
	template-latex/sbc-template.aux
	template-latex/sbc-template.tex
Config in UTF-8