Merge pull request #14 from lohuvie/master

merge
修改了传图过程中的等待图标
	modified:   css/new-activity.css
	modified:   js/jquery.new-activity-pic.js
	modified:   new-activity.php
	js/heartcode-canvasloader-min.js
	new file:   js/heartcode-canvasloader-min.js
Merge pull request #28 from willkan/master

修改了传图过程中的等待图标
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

图片上传中提示 上传错误提示
实现分类显示活动
	modified:   js/jquery.index.js
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
未登录 点击我喜欢 自动跳转到登陆页面
修改密码成功 前端
	new file:   css/reset-confirm.css
	modified:   css/sent-confirm.css
	new file:   js/jquery.reset-confirm.js
	new file:   reset-confirm.html
Merge pull request #33 from willkan/master

密码修改成功 前端
Merge pull request #3 from lohuvie/master

3.23更新