Merge branch 'devel' of https://github.com/sourcefabric/Superdesk into devel
Merge branch 'devel' of github.com:eozan/Superdesk into devel