Conflicts:
	Makefile
	console/console/Makefile
	controller/block/il2c/il2c.c
	controller/build.mk
	controller/controller/Makefile
	controller/controller/controller_setpoint_command.c