Merge branch 'master' of https://github.com/mozilla/CSOL-site
Merge branch 'master' of https://github.com/mozilla/CSOL-site
Fixing badge type filtering

Resolved #559
Fixing badge type filtering

Resolves #558
Merge branch 'master' of https://github.com/mozilla/CSOL-site
All references to "nickname" changed to "username"
Text changed to suggest printing at password page & bootstrap alert css class
Language consistency ("save" instead of "done")
"Password" changed to "Your Password"
Pencil changed to "Choose your own" at password selection
unnecessary offset removed
Merge pull request #573 from andrewhayward/tweaks

Fixing badge type filtering
Merge pull request #583 from mgballard/master

UX changes based on feedback