Merge branch 'master' of github.com:utcoupe/coupe14 into hokuyo_proto

Conflicts:
	hokuyo/src/main.c
Merge remote-tracking branch 'origin/hokuyo_proto'
mineur fix hokuyo
Merge branch 'master' into hokuyoX2

Conflicts:
	hokuyo/src/main.c