Divers
Merge branch 'dev' of https://github.com/iutbay/newsletter into dev

Conflicts:
	css/main.css
	protected/views/abonne/listeAbonne.php
	protected/views/layouts/main.php
	protected/views/listeDiffusion/admin.php
	protected/views/newsletter/index.php
	protected/views/site/index.php
	protected/views/utilisateur/admin.php