Merge pull request #1 from wesgt/server_api

Refactor DB DAO and pip-requires
Merge branch 'master' into server_api