Removed obsolete files generated from merge
Merge branch 'devel' of dev.sourcefabric.org:superdesk into devel