Merge branch 'master' into document_transaction
Playing with types
Fixing merge conflict.
Adding cropdowns for enums
Fixing merge conflict