Merge branch 'master' of https://github.com/f17qh/crazyass into crazyass_local

Conflicts:
	client/src/common.h
Merge branch 'master_local' of https://github.com/f17qh/crazyass into crazyass_local

Conflicts:
	client/src/common.h
编译不过