Merge branch 'master' into document_transaction
WIP: rework the annotation dropdown list to include the transaction types
fix typo in setting docpanel height
move to display_name for custom fields (over code names)
move transaction fields and type storage into document itself
be a bit more clever about assigning to doc.annotation_types to try to improve performance
Merge branch 'document_transaction' into testing
Merge branch 'testing' of github.com:sharewave/frontus into testing