Add 'base' template
Merge branch 'base'