Change-Id: I7b8c047f1747905c33ca2e3116995c44ffa5c529
Merge branch 'master' of https://github.com/xjy2061/bp.git

Conflicts:
	beautyplan/AndroidManifest.xml