四周计划_part1
Merge branch 'master' of ssh://git@github.com/xjy2061/bp.git

Conflicts:
	beautyplan/AndroidManifest.xml
	beautyplan/res/values/strings.xml