Merge pull request #12 from lohuvie/master

5.18
Merge pull request #13 from lohuvie/master

5.18下午
Merge pull request #57 from willkan/master

modified:   js/contacts/contacts.alert.js 	modified:   js/contacts/contacts.person.js
Merge pull request #14 from lohuvie/master

5.18Final
管理员后台
Merge pull request #59 from lemonz-/master

后台管理员界面及搜索
r-contact
5.27合并
部分链接修改
Merge pull request #60 from lemonz-/master

5.27合并及链接修复
活动页面的侧栏
搜索和评论的bug还有主页的推荐
Merge pull request #61 from lemonz-/master

活动页面的推荐侧栏样式
主页推荐和comment和搜索的bug
Merge pull request #63 from lemonz-/master

陈汉主页推荐和comment和搜索的bug
Merge pull request #1 from lohuvie/master

下
love
123
Merge branch 'master' of https://github.com/lohuvie/zhaibuqi
bug搜索