Conflicts:
	controller/controller/Makefile
	controller/controller/controller_block.c
	controller/controller/controller_load.c
	controller/dt_ctrl.c
	controller/ec/Makefile
	controller/ec/block_beckhoff_el7031.c
	controller/ec/block_stoeber.c
	controller/ec/canopen.c
	controller/ec/ec.c
	controller/ec/ec_stoeber.c
	controller/ec/ec_stoeber.h
	controller/ec/ec_test.c
	controller/ec/esc.c
	controller/ec/esc_coe.c
	controller/ec/esc_device.c
	controller/ec/esc_device.h