Merge pull request #1615 from djfm/1.6

// German fixtures
// change addons link
[-] BO : Copy all mail files for every lang on first translation/modification
// Typo.
Merge pull request #1616 from xBorderie/patch-1

// Typo.
// updated English emails
Merge pull request #1617 from djfm/emails

// updated English emails
// mail design for cart rules in order_conf
//fixed bug #PSCSX-1429
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] MO : BlockLayered - FixBug #PSCSX-1497 - Correct Change select value problem
// Typos.
Merge pull request #1618 from xBorderie/patch-1

// Typos.
// Typo.
Merge pull request #1619 from xBorderie/patch-2

// Typo.
[-] FO : FixBug #PSCSX-1473 - Category image problem
// Various typos.
[-] BO : change permissions when installing a module from zip
Merge pull request #1620 from xBorderie/1.6

// Various typos.
//footer link training