strange commit
Merge branch 'master' of github.com:ornythorink/linge

Conflicts:
	linge/modules/batch/controllers/sdc.cmdline.php
affinage du batch SDC