参考
Merge branch '1.1' of git://github.com/mindpin-shcmusic/pin-2012-edu into 1.1

Conflicts:
	pin-edu-sns/app/views/courses/demo_teaching_plan_new.html.haml
minor fixes