主要功能完成
Merge branch 'master' of https://github.com/xstd/private_phone

Conflicts:
	android_code/AndroidManifest.xml