Fix wrong remaining badge counter
Merge branch 'develop' of https://github.com/Solerni-R1-1/CoreBundle into develop