Refactored attributes to allow better child inheritance and filtering
Merge branch 'release/1.3-moorfields' of github.com:openeyes/OphCiExamination into release/1.3-moorfields