menxu/querstion 1,2
test_paper test_question test_paper_item 试卷 试题
Merge branch 'menxu/querstion' of github.com:mindpin/eshare into menxu/querstion

Conflicts:
	app/models/test_question.rb
	config/routes.rb
组卷参数
分数
组卷参数调整和自动评分
test_option 修改
2013/03/29
算分 answer
修改 3:28
new fill strategy
重构
课程的签到
Merge branch 'master' of github.com:mindpin/eshare

Conflicts:
	app/models/answer.rb
	app/models/course.rb
	app/models/course_ware.rb
	app/models/course_zip_importer.rb
	app/models/user.rb
	app/views/courses/index.html.haml
	app/views/questions/show.html.haml
	config/routes.rb
	spec/models/course_zip_importer_spec.rb
	spec/support/resources/course.zip