date sort
client to add messages
Merge branch 'refs/heads/master' into topics3lines