to format

Signed-off-by: stefens <stephen.schmidt.pro@gmail.com>
Merge branch 'master' of https://github.com/Nightmaster/PrivaConv2Peer

Conflicts:
	src/fr/esgi/annuel/gui/IdentificationView.java