reincluded topic and feed add_to() into a control statement
functions.php
Merge branch 'release1.2'