update
Merge branch 'master' of git://github.com/diversen/comment

Conflicts:
	add.php
	view.comment.inc