Merge branch 'master' into dev-thoumou
Début leaderboard
Merge branch 'dev-thoumou'

Conflicts:
	application/views/template/header.php