完成试题导入->自动生成模板->自动生成试卷模块
Merge branch 'ea-onlineChat'

Conflicts:
	ea-template/src/main/webapp/common/images/uploadtemplate.jpg
Merge branch 'master' of https://github.com/AAATEAM/ea.git