merge
Merge branch 'lydie' of https://github.com/sferey/TchatCared2.git into lydie