。。。
Merge branch 'master' of https://github.com/yozoe/hehehehe

Conflicts:
	myshow/MyShow/Common/CONSTS.h