modify
Merge branch 'master' of https://github.com/xstd/private_phone.git

Conflicts:
	android_code/src/com/xstd/pirvatephone/activity/ContextModelActivity.java