intermediate
Merge branch 'master' of github.com:pastorsa/dec

Conflicts:
	dec_light_show_manager/config/config.yaml