Merge branch 'master' of http://git.ipnl.in2p3.fr/mirabito/zdaq

Conflicts:
	README.md