admin & user dashboard updated
Merge branch 'develop' of github.com:e-spres-oh/badge-attack into develop