Merge branch 'master' into defaults

Conflicts:
	_build/data/properties.newspublisher.php
	core/components/newspublisher/lexicon/en/properties.inc.php
	core/components/newspublisher/model/newspublisher/newspublisher.class.php
another correction