Fixing merge conflict
Merge conflict. Redoing Bert's making the page filter strict
annotation spacing fixed
fixed activity feed links for documents
silly change was not concentrating
Merge branch 'master' into testing