file registry/delete article
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/locales/en.yml
Update file registry