Spectra model
Merge branch 'develop' of https://github.com/pcm32/LayoutPipeline into develop