gallery templates comboboxes
Merge branch 'development' of https://github.com/pixelgrade/pixtypes into development