Refonte complète du site
Merge branch 'master' of http://github.com/giliam/Giliam-Website

Conflicts:
	index.php