增加修改模版功能
Merge branch 'chaiyingli'
闪烁的bug
add select/tableselect
Merge branch 'master' into lifei
图片上传
增加删除模版功能
Merge branch 'chaiyingli'
Merge branch 'master' of https://github.com/xdfcn/items
Merge branch 'master' into commit

Conflicts:
	source/routes/design.js
Merge branch 'master' into commit

Conflicts:
	source/routes/design.js
Merge branch 'master' into commit

Conflicts:
	source/routes/design.js
Merge branch 'master' into lifei
Merge branch 'master' into commit
165 166 168
testpapers list done
test
Rebirth
html5 页面录音上传功能提交
Merge branch 'nldjyhl'