Pourquoi j'ai un sync a faire
Merge branch 'master' of https://github.com/Ariekor/Disco

Conflicts:
	.gitignore
	Discotheque/nbproject/private/private.xml