Merge branch 'templating'
Merge branch 'master' of https://github.com/cmlizama/sandboxloco