substring mulu
kind
no properties
no properties
no change pic
Merge branch 'master' of github.com:hyrtyp/guokaihang

Conflicts:
	Cei/assets/configuration.properties
	CeiPhone/assets/configuration.properties