BIG COMMIT DE LA MORT QUI TUE
Merge branch 'master' of https://github.com/Frumba/QiQi

Conflicts:
	msn/contactrowform.cpp
Fix merge