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
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/fragments/ContactFragment.java
修改联系人还原中提示
Merge branch 'chende'
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	res/layout/frag_music_item.xml
	res/layout/frag_video_item.xml
	res/values/strings.xml
	src/com/chainton/pdmclient/adapters/FragMusicAdapter.java
	src/com/chainton/pdmclient/fragments/MusicFragment.java
	src/com/chainton/pdmclient/fragments/PictureFragment.java
	src/com/chainton/pdmclient/fragments/VideoFragment.java
	src/com/chainton/pdmclient/system/service/GalleryMusicService.java
	src/com/chainton/pdmclient/system/service/GalleryPictureService.java
	src/com/chainton/pdmclient/system/service/GalleryVideoService.java
	src/com/chainton/pdmclient/system/service/SystemMediaService.java