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

* 'master' of https://github.com/thelia/thelia: (33 commits)
  permissions
  finish contact process
  create contact form
  create example for mail usage
  permission cleanup
  change place where absolute url is create when rewritten url is enabled
  fix issue #43
  fix typo in product breadcrumb
  update countries list
  fix issue #35
  fix cartItem updateQuantity method
  add some verification on country default trigger
  not allowed to delete default country
  WIP : admin profiles
  fiw test suite
  clear cache when a module is removed
  end module removal
  create event object for module delete action
  update insert script
  new model
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php

templates/admin/default/coupon-create.html

@@ -1,5 +1,8 @@
 {extends file="admin-layout.tpl"}
-{block name="check-permissions"}admin.coupon.create{/block}
+
+{block name="check-resource"}admin.coupon{/block}
+{block name="check-access"}create{/block}
+
 {block name="page-title"}{intl l='Create coupon'}{/block}
 
 {block name="main-content"}