Merge branch 'master' into eyebot
Restored e-puck stub.
Merge branch 'eyebot' of ssh://bohr/home/pincy/Fabrica/argos3 into eyebot
Merge branch 'master' into eyebot

Conflicts:
	src/plugins/robots/CMakeLists.txt