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

Conflicts:
	config/locales/en.yml
Update file registry
Update file registry
merges and fixes
Merge branch 'development' of https://github.com/maxcobmara/ogma into development

Manual Pull Merge