fix updating of the property traitId
Merge branch 'master' of https://github.com/digitalabs/Fieldbook