Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1
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
Fix the filter
Fix the filter
Remote teaching_plans controller show action
Fix the filter
fix update form of teaching plan
Add delete of teaching_plans controller
Remote html tag in the content
Merge branch '1.1' of git://github.com/arlyxiao/pin-2012-edu into 1.1

Conflicts:
	pin-edu-sns/app/assets/javascripts/app_js/by_menxu/teacher_plans.js.coffee