Improve user model for TalkAbout
update
Fix typo
Merge remote-tracking branch 'upstream/develop' into develop