Merge pull request #34 from kevinyby/develop

message
read and unread flag
fix confilt in sql file
develop
develop