Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management

# By gmorel (3) and franck (1)
* 'catalog' of https://github.com/thelia/thelia:
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Impemented combination creation
WIP : upload documents : add action, ctrl, event
Working : upload : fix unit test
Working : refactor : naming conventions
Working : fix url document + refactor : naming conventions
Working : Add a link on documents
Working : FileManager :Add some more unit tests
Working : Fix : Image Management + Document Management
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
Working : Fix : Unit test
Working : Fix : Unit test
Merge branch 'catalog' of https://github.com/thelia/thelia into catalog

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

* 'upload_management' of https://github.com/thelia/thelia:
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event