Template, Portada ...
Merge origin/master