Replace my mock Template with "real" TemplateBean
Merge remote-tracking branch 'origin/master'