newsList
Merge remote-tracking branch 'origin/master'

Conflicts:
	newsList.php
newsList
Merge remote-tracking branch 'origin/master'