Updated templates
Merge branch 'master' of https://github.com/vitorbritto/boilerplates