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
Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management

# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Finished product combination basic function
  Formatted combination table