fix for my env
Small fix
Merge branch 'master' into pjw

Conflicts:
	Server/cdatabase.cpp
On branch pjw
modified:   Server/cdatabase.cpp
Merge pull request #1 from pengjingwen1994/pjw

Small Fixes