ajout contactconversation
Merge branch 'master' of https://github.com/BAKFR/linpop

Conflicts:
	Linpop/contactwindow.cpp
Merge branch 'master' of https://github.com/BAKFR/linpop

Conflicts:
	Linpop/inputcommandmessageinvitation.cpp
Correction du nom login