Novos templates
Merge origin/master