修改一些前台界面
tom 日本修改
Merge branch 'master' into local

Conflicts:
	wte/src/main/resources/database-${db}.properties
	wte/src/main/webapp/app/exam/knowledge/ajax_knowledge.ftl