增加了信息和对话备份记录
Merge branch 'master' of https://github.com/xstd/private_phone.git

Conflicts:
	android_code/external/PrivatePhoneDaoGenerator/src/com/photo_me/mobile/android/dao/generator/PMDaoGenerator.java