Badges check feature
Using helper to refator code
Change router's name
Merge branch 'lee' into develop