功能分配
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/setting.xml