Merge pull request #886 from djfm/bootstrap

//emails
[*] LO : New English E-Mail templates by SuperSarah
// new design for followup module mail
// fixed indentation in e-mail html templates
// Fixed rounding
// Removed useless alert
//typo
// Code cleaning and small fixes
// Renamed Feature into Product Features
// Fix list title
// Attributes and values => Product Attributes
//followup now use bootstrap design
// new design for blocknewsletter mails template
// new design for blockwishlist mails template
// admin orders
// Code review
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	admin-dev/themes/default/css/admin-theme.css
// new design for mailalerts mails template
// fixs
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap