preliminary templates
Merge branch 'master' of https://github.com/GBora/assistant-O