Added viewtopic template
Merge amended branch

Conflicts:
	viewtopic.php