Feature/deploy a template with overrides

The commits from 10/30 are from #415