badgeuse infos ++
Merge branch 'master' of https://github.com/bodtx/cantine

Conflicts:
	.gitignore
	cantine.properties
	cantine.script