Lastest changes to templates
Merge branch 'master' of https://github.com/eduardolujan/Vildosola