Fix some timestamp issues
Fix conflict

Conflicts:
	include/discuss.php