Merge branch 'master' of https://github.com/thelia/thelia into coupon

# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (37 commits)
  add PropelDataCollector to debugbar, still missing some informations
  remove unused class
  integrate debugbar module
  remove htmlpurifier
  modify insert.sql including debugBar module
  add new event and new tag
  Started category modification
  Factorized modal dialogs javascript
  Factorized creation and confirmation modal dialogs
  create controller adding delivery module in session
  create Delivery loop
  Working :
  Continuing categories administration...
  Working :
  create base loop for delivery and payment entities
  remove htmlpurifier dependency
  country id can be an argument for calculate method
  Working :
  Working :
  fix typo
  ...

Conflicts:
	composer.lock
	core/lib/Thelia/Controller/Admin/CategoryController.php
	templates/admin/default/assets/less/thelia/variables.less
Merge branch 'master' of https://github.com/thelia/thelia into coupon

# By Manuel Raynaud (92) and others
# Via Manuel Raynaud (28) and others
* 'master' of https://github.com/thelia/thelia: (212 commits)
  fix typo
  add some php doc
  integrate swiftMailer as mailer solution
  add swiftmailer in composer
  use dump autoloader in all compser scripts
  remove script part of composer.json file
  fix typo
  add some information for OSX requirements
  No alert bloc
  default country
  Autofocus on username field for better use
  Beautiful login page
  feed loop is now countable
  Change error page design
  Add validation button on form
  - Edit country view creation - Delete and edit modalbox creation - Countries routes management
  Completed template management
  fix faker
  fix faker script
  Working : Fixture : cleaning
  ...
WIP : Coupon functional tests
Merge branch 'master' of https://github.com/thelia/thelia into coupon

# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Typo
  Added UrlRewritingTrait to manage URLs from model classes
  Started category management
WIP : Coupon : unit tests on Operator
WIP : Coupon : unit tests on Rules
WIP : Coupon : unit tests on Rules
Merge branch 'coupon' of https://github.com/thelia/thelia into coupon

# By Manuel Raynaud (27) and others
# Via Manuel Raynaud (8) and others
* 'coupon' of https://github.com/thelia/thelia: (50 commits)
  WIP : Coupon : unit tests on Rules
  WIP : Coupon : unit tests on Rules
  WIP : Coupon : unit tests on Operator
  WIP : Coupon functional tests
  Typo
  Added UrlRewritingTrait to manage URLs from model classes
  Merge branch 'master' of https://github.com/thelia/thelia into coupon
  fix typo
  Started category management
  add some php doc
  integrate swiftMailer as mailer solution
  add swiftmailer in composer
  use dump autoloader in all compser scripts
  remove script part of composer.json file
  fix typo
  add some information for OSX requirements
  No alert bloc
  default country
  Autofocus on username field for better use
  Beautiful login page
  ...
Working : Coupon : Unit testing
Working : Coupon : fixture add old coupon
Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon

* 'coupon' of https://github.com/thelia/thelia:

# By Etienne Roudeix (17) and others
# Via Etienne Roudeix (9) and others
* 'master' of https://github.com/thelia/thelia: (52 commits)
  fix content faker
  fix typo and remove url generation in postInsert model
  add covers annotation in ProductRewriteTest
  create test for UrlRewritingTrait
  payment loop
  fix postage display
  postage + invoice step
  template is not mandatory in product table.
  refactor rewrriten method name
  Changed getDefaultCategory in getDefaultCategoryId
  remove old model classes:
  Working : Content : fix loop giving no elements
  Working : Content : fix loop giving no elements
  Added missing files...
  Started product management
  Working : Content : fix loop giving no elements
  Working : Product : fix loop giving no elements
  cart billing integration
  empty cart or delivery exception
  remove isntall routing and template
  ...
Working : Coupon : fix loop
Working : Coupon : fix loop, fix read display
Working : Coupon : fix loop, fix read display
Working : Coupon : fix loop, fix read display
WIP : Upload management
Working : Coupon : fix update effect (becomes type), update max usage
Working catalog branch
Added missing files
Creation of mailing system configuration variables management view