Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
big code improvement + badge page
big update with badges
Merge branch 'master' into dev