修改
Merge remote-tracking branch 'origin/master' into chenyan
Merge branch 'master' into chende
修改个人空间音乐的显示
Merge remote-tracking branch 'origin/master' into chenyan
增加个人空间对短信的操作
对个人空间图片的操作
。
Merge branch 'master' into chende

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