Error handling
Merge branch 'master' into error-handling

Conflicts:
	app/index.js
Merge pull request #309 from mozilla/error-handling

Error handling
makes tab styling more universal so we don't have to keep writing styles for it
adds the admin settings layout and updates styling for tabs
WIP commit
First pass at user admin for realz
0.0.24
Adding API endpoints for add/delete user
Merge pull request #266 from mozilla/user-adminz

User adminz
updating docs
Merge pull request #315 from mozilla/api-doc-update

updating docs
Changes the header with the new styling of sub nav and adds issuer name to the header as well #280 [#69011040] [#69006942]
Add badge type to badges
Small tweaks
Merge pull request #322 from mozilla/badge-types

Add badge type to badges
Readme redraft/ update.
Commenting out issuer name dropdown for now
Merge pull request #321 from mozilla/navigationz

Changes the header with the new styling of sub nav and adds issuer name ...
Merge pull request #326 from mozilla/readme-update

Readme redraft/ update.