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