Merge origin/master

Conflicts:
	news.php
Merge origin/master
Update
Update fetchBySearch