Merge branch 'master' into dev
talks lastMessage fix minified
talks lastMessage fix and minified
Merge remote-tracking branch 'origin/master'