Topic template

First commit.
Merge remote-tracking branch 'origin/site_builder' into frontend
Template fixes
Merge branch 'frontend'