Merge pull request #71 from mbathletes/andres

Andres
fixed db error
fixed admin user bug
Merge pull request #72 from mbathletes/dylan

Dylan