Fix the view_topic method
Fix conflicts

Conflicts:
	include/discuss.php
	include/discuss/topic_body.php
	include/functions.php