SITE BASE A JOUR
Merge remote-tracking branch 'origin/master'

Conflicts:
	bio.php
	css/styles.css
	js/main.js
	medias/index.php
	medias/retrieve-medias.php
	module-footer.php
	nav.php