template save
Merge branch 'commit'
Merge branch 'henryleu'
update testpaper structure
Merge branch 'master' of https://github.com/xdfcn/items
update tp-edit-2.ejs
use typeRegister in tq-edit
use typeRegister
test question content save
Merge branch 'commit'
css add class
Merge branch 'master' into chaiyingli

Conflicts:
	source/views/tqt-index.ejs
	web/js/template/designer.core.js
Merge branch 'master' into chaiyingli

Conflicts:
	source/views/tqt-index.ejs
	web/js/template/designer.core.js
test git
test git
css 冲突解决
实现发布功能
Merge branch 'feivorid'
附加页功能添加
Merge branch 'master' of https://github.com/xdfcn/items