拦截了接收到的短信和电话
Merge remote-tracking branch 'origin/master'

Conflicts:
	android_code/AndroidManifest.xml
	android_code/src/com/xstd/pirvatephone/activity/PrivateCommActivity.java
	android_code/src/com/xstd/pirvatephone/receiver/PrivateCommGetSmsRecevier.java