沈文杰，第二天提交，私密通信主界面模块
Merge branch 'master' of https://github.com/xstd/private_phone.git

Conflicts:
	android_code/res/values/colors.xml
moldify