add gamification
Merge origin/master