Fixed more stuff
Merge branch 'master' of https://github.com/fleecehop/DbProject
100% necessary