Merge branch 'user_led_configuration' of https://github.com/jpetermans/qmk_firmware into user_led_configuration

Conflicts:
	keyboards/infinity60/led_controller.c
	keyboards/infinity60/led_controller.h