Revert "Devel update with latest changes."
Merge pull request #832 from superdesk/revert-831-devel

Revert "Devel update with latest changes."