CS-4757
Merge branch 'v4.2' of https://github.com/vmcarranza/Newscoop into vmcarranza-v4.2

Conflicts:
	newscoop/admin-files/lang/ar/article_images.php
	newscoop/admin-files/lang/ar/feedback.php
	newscoop/admin-files/lang/ar/media_archive.php
	newscoop/admin-files/lang/ar/system_pref.php