Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/db/DBOpenHelper.java
。
Merge branch 'chenyan'
Merge branch 'chenyan'
增加联系人备份
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/db/DBOpenHelper.java
。
Merge branch 'chenyan'