Merge pull request #56 from bytekast/BACKLOG-1498

[BACKLOG-1498] First stab at model annotation definition
[BACKLOG-1498] Add new properties in model annotation definition