Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/fragments/ContactFragment.java
修改联系人还原中提示
Merge branch 'chende'