plugin update
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/orion/news/models/NewsList.php