Updates
Merge branch 'master' of github.com:Mika81/lokisalle

Conflicts:
	admin/Envoi_newsletter.php