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
fix issue with dragging annotations not working
Merge branch 'master' into document_transaction

Conflicts:
	documents/partials/annotation.html