some post-merge fixes

- adjustments for feedbackfunctions.php
- adjustments for admin_feedback_browse.php
- adjustments for admin_template_feedback.php