Merge pull request #16 from University-of-Auckland/develop-add-attributes

Add missing optional attributes
Merge branch 'aaf/develop' (merge commits) into code-develop
Merge branch 'code-develop' into tuakiri-develop