Database Class + Imports
Merge pull request #275 from dreamteam69/master

Database Class + Imports