Merge pull request #341 from FCStrike/dev

Handle edge cases for use account password update
Merge pull request #342 from FCStrike/dev

Allow admin to hit enter to add new categories/companies
Implement reset password
Reposition reset
Merge pull request #343 from willwclo/like-the-fourth-of-july

Implement reset password
Add company tagline
Merge pull request #344 from willwclo/reach-for-the-stars

Add company tagline
De-indent
Merge pull request #345 from willwclo/not-a-bad-thing

De-indent