Formatted combination table
Merge branch 'catalog' of https://github.com/thelia/thelia into catalog
Merge branch 'catalog' of https://github.com/thelia/thelia into catalog
Finished product combination basic function
Merge branch 'catalog' of https://github.com/thelia/thelia into catalog