Add templates for the different light sources to editor
Revert linebreaking object names for now
Merge remote-tracking branch 'origin/master' into Design