Finished category related content management
Merge branch 'master' of https://github.com/thelia/thelia
Polished categories related content
Working : Fixture : Product add default category
Merge branch 'master' of https://github.com/thelia/thelia

# By Etienne Roudeix (10) and franck (2)
# Via Etienne Roudeix (3) and franck (2)
* 'master' of https://github.com/thelia/thelia:
  Polished categories related content
  Finished category related content management
  delivery process
  delivery form
  order delivery form
  fix fixture dependant unit test
  delivery process
  delivery process
  cart integration
  cart integration
  cart page
  cart template

Conflicts:
	install/faker.php
Merge branch 'master' of https://github.com/thelia/thelia

# By Etienne Roudeix (10) and franck (2)
# Via Etienne Roudeix (3) and franck (2)
* 'master' of https://github.com/thelia/thelia:
  Polished categories related content
  Finished category related content management
  delivery process
  delivery form
  order delivery form
  fix fixture dependant unit test
  delivery process
  delivery process
  cart integration
  cart integration
  cart page
  cart template

Conflicts:
	install/faker.php
Working : Product : add faker default category
Working : Content loop : add default content parameter
Working : Content : add faker default folder
Merge branch 'master' of github.com:thelia/thelia