working on message cards
Merge remote-tracking branch 'origin/master'