update message senderId int->nsstring
update messageEntry
Merge remote-tracking branch 'origin/master'