Fixed issue with optional attributes on entities
Merge branch 'master' into studyLocation
fixed optional attributes which may need a default value.
Merge branch 'master' into studyLocation