Lamp fixes

Слиты nikitronn запросил слияние lamp_fixes в master

Created by: zeffii

  • use collection now, by default
  • use type = "LIGHT" instead of "LAMP" (doesn't exist anymore)