Fix answer link and persist tpl design to single
Merge branch 'hotfix-feed-single-template' into development

* hotfix-feed-single-template:
  Fix answer link and persist tpl design to single
Complete adding of answers
Merge branch 'feature-allow-answers' into development

* feature-allow-answers:
  Complete adding of answers