update
Merge remote-tracking branch 'origin/master'

Conflicts:
	addNews.php
	myComment.php