新手活动
Merge branch 'master' of https://github.com/LiesLee/suoping

Conflicts:
	res/values/colors.xml
冲突