Fix navbar/settings nav position on small devices
Merge branch 'dev' of https://github.com/PROCERGS/login-cidadao into dev
Add statistics by city #172
replicado layout do register normal
alterado o formulario do register prefiled
Init badges info
Merge branch 'dev' of https://github.com/PROCERGS/login-cidadao into dev
problemas com o js
Merge branch 'dev' of https://github.com/PROCERGS/login-cidadao.git into dev
Badges list
Merge branch 'dev' of https://github.com/PROCERGS/login-cidadao into dev
Habemus temp badges
Improv badges
Badges and city statistics
Merge branch 'dev' into two-factor-auth

Conflicts:
	src/PROCERGS/LoginCidadao/CoreBundle/Resources/public/css/logged/logged.css
	src/PROCERGS/LoginCidadao/CoreBundle/Resources/translations/messages.pt_BR.yml
Removed fork-specific code
Adapted Person to work with new version of scheb/two-factor-bundle
Fix statistics #172
Add badges empty alert
Added Backup Code generation