Merge pull request #799 from roc13x/master

Core/DBLayer: multiple fixes
Merge branch 'master' of git://github.com/ProjectSkyfire/SkyFireEMU