Merge pull request #11 from lohuvie/master

merge
3.12 22:14
Merge pull request #21 from lemonz-/master

修改密码提示和功能完成
Merge pull request #12 from lohuvie/master

merge
	modified:   css/index.css
	modified:   js/jquery.index.js
	modified:   css/personal-info.css
	modified:   js/jquery.new-activity-pic.js
	modified:   js/jquery.personal-info-pic.js
	modified:   personal-info.php
	modified:   js/jquery.new-activity-pic.js
	modified:   js/jquery.personal-info-pic.js
	modified:   css/personal-info.css
3.14 20:25
Merge pull request #25 from willkan/master

首页更新 切图框更新
Merge pull request #26 from lemonz-/master

完成活动时间范围检验功能
Merge pull request #13 from lohuvie/master

merge
denglu

dadasdasd
Merge branch 'master' of https://github.com/lkjxa186/zhaibuqi