BD + templates
Merge branch 'master' of https://github.com/asime/confdemo