for android
support android
Merge branch 'master' into 0327-2

Conflicts:
	client/src/common.h