Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
Signed-off-by: 陈释荣 <11301119@bjtu.edu.cn>
Merge branch 'Csrr' of git@github.com:CRM2014/cf.git
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
Signed-off-by: lovewindy <1063652094@qq.com>
Signed-off-by: 七国军队 <1211412423@qq.com> 秦辉
Signed-off-by: xiaoping <xiaoping>

增加
menu action连接
个人日报
Signed-off-by: xiaoping <xiaoping>

7.15个人日报
Signed-off-by: 陈释荣<11301119@bjtu.edu.cn>
上传个人日报
Signed-off-by: 刘梦莹 <11301099@bjtu.edu.cn>
个人日报
Merge branch 'LiuMengYing' of git@github.com:CRM2014/cf.git
Merge branch 'qinhui' of git@github.com:CRM2014/cf.git
Merge branch 'windy' of git@github.com:CRM2014/cf.git
Merge branch 'wpy' of git@github.com:CRM2014/cf.git
Merge branch 'qiyu'

Conflicts:
	doc/个人日报/个人日报-秦辉.xls
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
Merge branch 'xiaoping' of git@github.com:CRM2014/cf.git
Signed-off-by: lovewindy <1063652094@qq.com>
Merge branch 'windy' of git@github.com:CRM2014/cf.git