Attempt at getting database connectivity working.
Merge branch 'develop' of https://github.com/Jherrmann5/ABA into develop
Changes a few merge conflicts.