Merge pull request #15 from lohuvie/master

merge
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   js/jquery.new-activity-pic.js
	modified:   js/jquery.personal-info-pic.js
	modified:   js/jquery.picUpdate.js
	modified:   personal-info.php
 Changes to be committed:

	modified:   js/jquery.new-activity-pic.js
	modified:   js/jquery.personal-info-pic.js
Merge pull request #30 from willkan/master

图片上传中提示 上传错误提示