Merge branch 'master' of github.com:xspeedcruiser/nlb
db settings