gestion de la trayicon
Merge branch 'master' of github.com:BAKFR/linpop

Conflicts:
	Linpop/Linpop.pro
	Linpop/contactwindow.cpp