个人设置&项目设置完成

个人设置&项目设置已经完成
Merge branch 'server' of https://github.com/tongji-qqg/EasyAgile into server

Conflicts:
	website/views/footer.html
	website/views/header.html