Merge remote-tracking branch 'upstream/master' into CS-4849

Conflicts:
	newscoop/admin-files/article_types/fields/index.php
	newscoop/src/Newscoop/NewscoopBundle/Resources/views/BackendArticleImages/edit.html.twig
Merge branch 'CS-4849' of github.com:m038/Newscoop into CS-4849

Conflicts:
	newscoop/admin-files/article_types/fields/index.php