Improved and simplified.
Merge remote-tracking branch 'upstream/develop' into develop
Fix user model code
Merge remote-tracking branch 'upstream/develop' into develop
merge from upstream and new TalkAbout