交付日本前的版本提交，修改了大多数bug和用户体验。
Merge branch 'master' of https://github.com/AAATEAM/wte.git

Conflicts:
	wte/src/main/webapp/file/question-sample-import-by-excel.xls
delete log.txt file