nnn
Merge branch 'master' of https://github.com/daodaoliang/caicai

Conflicts:
	src/checkwidget.cpp
nihao