Merge pull request #1 from himmel22/master

选择题录入
试题编辑:
	重构teacher_text_question_form,区分新增试题和更新试题
修改为本底数据库
问答题修改功能完成
menu提出
Merge branch 'master' of https://github.com/himmel22/jplesson into himmel22-master

Conflicts:
	sites/all/modules/teacher/teacher.module
试题模块:添删改查 完成
试卷自动生成系统
Merge remote-tracking branch 'wuqian/master'