提交代码
Merge branch 'master' of https://github.com/daodaoliang/caicai

Conflicts:
	src/sqlmanager.cpp