Content annotations and Document Manger Fix

Now content annotations are possible. Also, caption and annotation files
are delete-able and they work through nice ajax calls.
Merge branch 'santi' into develop