Merge pull request #30 from willkan/master

图片上传中提示 上传错误提示
Merge pull request #31 from willkan/master

实现分类显示活动
喜欢活动 关注某人
邮件系统
	new file:   php/get_password.php
	new file:   php/register_send_email.php
	new file:   php/send_email.php
	new file:   register-confirm.html
	modified:   register.php
	modified:   get-password.php
	modified:   login.php
	modified:   php/login.php
	modified:   reset-password.php
	modified:   sent-confirm.html
	modified:   get-password.php
	modified:   login.php
	modified:   php/login.php
	modified:   reset-password.php
	modified:   sent-confirm.html
Merge pull request #32 from lkjxa186/master

邮件系统
Merge pull request #16 from lohuvie/master

merge