//small fix
Merge branch 'dev'
//new version gamification