Add test to editmap for item.light
Fix merge error and actually apply added lightsources
Merge branch 'lightsource_fix' into itype_light_improvement