commit

commit
Merge branch 'master' of https://github.com/MeuRotulo/meurotulo

Conflicts:
	module/Application/src/Application/Controller/TemasController.php
	public/templates/template_6.png
	public/templates/template_6_sample.png