Add gamification logique
Merge origin/master