login / contactwindow / addwindow
Résolutions des conflicts Merge branch 'master' of https://github.com/BAKFR/linpop

Conflicts:
	Linpop/Linpop.pro
	Linpop/contactwindow.h
	Linpop/main.cpp
	Linpop/ui_addcontactwindow.h
	Linpop/ui_contactwindow.h
	Linpop/ui_loginwindow.h
blabla
Merge branch 'master' of https://github.com/BAKFR/linpop

Conflicts:
	Linpop/Linpop.pro