newsfeeds plugin update
Merge branch 'master' of https://github.com/wijiti/jsolr

Conflicts:
	plugins/jsolrsearch/content/content.php