test
Merge branch 'master' of https://github.com/ZJU-ISST/ISST-iOS
Merge branch 'master' of https://github.com/ZJU-ISST/ISST-iOS
新侧边栏以及刷新
no message
Merge branch 'master' of https://github.com/ZJU-ISST/ISST-iOS
12.8
增加通讯录打电话，发短信，发邮件的功能
12.8 4
将同城校友部分独立出来
12.9 code
add the push
Merge branch 'master' of https://github.com/ZJU-ISST/ISST-iOS

Conflicts:
	Login/ISSTLoginViewController.m
12.11
merge
Merge branch 'master' of https://github.com/ZJU-ISST/ISST-iOS