Merge branch 'server' of https://github.com/tongji-qqg/EasyAgile into server

Conflicts:
	website/views/project/project_main.html
消除冲突

消除冲突