Merge pull request #122 from mapkyca/fix_annotation_permalink

Fixes WSOD on annotation permalink
Merge pull request #123 from mapkyca/annotation_trigger_obj

In order to be useful, we need to pass the context of the entity we're a...
Merge branch 'master' into dev