Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/fragments/ContactFragment.java
联系人的还原
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/fragments/ContactFragment.java