Ajout de la baniere
ajuste des trucs
Merge branch 'dev' of https://github.com/SSD-ESIEA/SSD into dev

Conflicts:
	site/template/header.php
Merge branch 'master' of https://github.com/SSD-ESIEA/SSD into dev
Merge pull request #53 from SSD-ESIEA/dev

Dev