ccplus merge
Merge branch 'master' of http://git2.niven.cn/ccplus

Conflicts:
	src/core/ccplus.cpp