增加视频图片短信备份，删除个人空间通话记录的显示
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	res/layout/frag_call.xml
	res/layout/frag_call_item.xml
	res/layout/frag_mms_item.xml
	src/com/chainton/pdmclient/adapters/FragCallAdapter.java
	src/com/chainton/pdmclient/fragments/CallFragment.java
	src/com/chainton/pdmclient/loader/CallLoader.java
	src/com/chainton/pdmclient/loader/CallLoaderCallbacks.java
	src/com/chainton/pdmclient/loader/MmsLoader.java
	src/com/chainton/pdmclient/loader/PictureLoader.java
	src/com/chainton/pdmclient/loader/VideoLoader.java
修改xml
增加个人空间音乐
增加个人空间音乐
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	res/layout/del_data_layout.xml
	res/values/strings.xml
	src/com/chainton/pdmclient/DelLocalDataActivity.java
	src/com/chainton/pdmclient/LoadingActivity.java
	src/com/chainton/pdmclient/LoginActivity.java
	src/com/chainton/pdmclient/loader/MyReceiver.java
	src/com/chainton/pdmclient/services/CycleApp.java
	src/com/chainton/pdmclient/services/CycleCall.java
	src/com/chainton/pdmclient/services/CycleMedia.java
	src/com/chainton/pdmclient/services/CycleMms.java
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java
	src/com/chainton/pdmclient/utils/OperationUtil.java
	src/com/chainton/pdmclient/view/custom/ConfirmDialog.java
删除settings