添加一个样式
Merge branch '1.1' of gitcafe.com:ben7th/pin-2012-edu into 1.1
pull 开始模型一
Merge branch '1.1' of git://github.com/mindpin-shcmusic/pin-2012-edu into 1.1
Merge branch '1.1' of git://github.com/mindpin-shcmusic/pin-2012-edu into 1.1

星期一  pull
teaching plan show
Merge branch '1.1' of git://github.com/mindpin-shcmusic/pin-2012-edu into 1.1
章节的编辑
merge
Merge branch '1.1' of git://github.com/arlyxiao/pin-2012-edu into 1.1
章节曾减
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1
Merge branch '1.1' of git://github.com/arlyxiao/pin-2012-edu into 1.1
add course_ware create
增加管理课件链接
new chapter title generator
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1

Conflicts:
	pin-edu-sns/app/controllers/chapters_controller.rb
	pin-edu-sns/app/edu_models/course_pack/chapter.rb
	pin-edu-sns/app/views/courses/show.html.haml
	pin-edu-sns/app/views/teaching_plans/show.html.haml
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1
Filter teaching_plans by semester_value, course_id, teacher_user condition