TdF

MaJ mineur
Merge remote-tracking branch 'origin/master'

Conflicts:
	BBM_client/nbproject/genfiles.properties