Changes to database class
Merge branch 'master' of https://github.com/jeffrobdun/dev
Removed uncessary directories