shadoks
Merge branch 'master' of https://github.com/Numero7/Marmotte

Conflicts:
	config.inc.php