Merge branch 'master' of https://github.com/jmcomets/dragibus-pi

Conflicts:
	src/process.c
Merge branch 'master' of https://github.com/jmcomets/dragibus-pi
Merge branch 'master' of https://github.com/jmcomets/dragibus-pi