Serveur - Mineur
Merge branch 'master' of https://github.com/Zimroid/LaClemenceDAuguste

Conflicts:
	A-ServeurAuguste/nbproject/private/private.xml