Merge branch 'master' of git://github.com/thelia/thelia into french_translation

* 'master' of git://github.com/thelia/thelia:
  add REF to product_sale_element loop and fix product tempalte
  Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
  Add correct url(subdiretory included) in config page
  Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
  Check if store_country has a value
  Fixed double '/' in generated assets URLs
  Add validation for Store configuration
  Use Store contact information
  Call the wrong AdminResources in saveAction
  Action buttons smaller
  Replace company_name and contact_email by store_name & store_email
  Add a new admin page to manage the basic store configurations
  Add routing for Store Configuration
  Add argument Title on Content Loop & Folder Loop
Translation : Fix bug preventing to see error message
Merge master
Spelling rewritten with 2 t
Translation : some fre_FR added
Translation : some fre_FR added
Translation : some fre_FR added
Translation : some fre_FR added
Merge branch 'master' of git://github.com/thelia/thelia into french_translation

* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email
Merge pull request #106 from gmorel/master

Condition Module - adding/refactor unit tests
Merge branch 'master' of git://github.com/thelia/thelia into french_translation

* 'master' of git://github.com/thelia/thelia: (23 commits)
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Fix namespace issues
  Coupon : Fix namespace issues
  Coupon : Adding unit tests
  Coupon : Adding unit tests
  Coupon : Adding unit tests
  Coupon : Adding unit tests
  Coupon : buildCouponFromModel becomes public
  Coupon : Add ability to know usage left after decremental
  Coupon : Bug fix when coupon max usage was not correctly decremented
  Coupon : spelling
  Coupon : rename
  Coupon : Fix the error if a given coupon leads to an unknown service id
  Coupon not found by the factory now just return false
  Fix generated unit test stub files
  Refactor removing Manager notion
  ...
Translation : more fre_FR added
Merge
Fixed some translations
Merge pull request #122 from Boyquotes/master

Fixed some translations
Merge pull request #121 from gmorel/french_translation

French translation
add module_include block in product-edit page
Merge branch 'master' of github.com:thelia/thelia
Translation : Fix bug preventing to see error message
Merge master