merge
Merge remote-tracking branch 'origin' into message_board
new message system
Merge pull request #37 from capms/message_board

Message board