Modification sur le management des emails
Merge branch 'master' of https://github.com/PhilippeDumont/mail

Conflicts:
	src/client/Client.java