merged from yassine's branch
Merge branch 'master' of github.com:X3N0-Life-Form/Reseaux-MessengerApp