maj
Merge branch 'master' of https://github.com/Frumba/QiQi
ajout des qiqiButton
Merge branch 'master' of https://github.com/Frumba/QiQi

Conflicts:
	msn/addcontactdialog.cpp
	msn/msn.pro
	msn/resources.qrc