Added checks on badges and front controller update
Merge pull request #343 from stefk/update-checks

Added checks on badges and front controller update