。
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/fragments/ContactFragment.java
个人空间视频，音乐
Merge branch 'chenyan'
Merge branch 'master' into chende

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