Making the document manager in the dashboard work again
Merge branch 'master' into issue217