guo
Merge branch 'chengdu' of git://github.com/mindpin-shcmusic/pin-2012-edu into chengdu

Conflicts:
	pin-edu-sns/app/assets/javascripts/app_js/by_menxu/teacher_plans.js.coffee
	pin-edu-sns/app/views/g2/show.html.haml
crete TestPapers
udate test_papers
Merge branch 'chengdu' of git://github.com/menxu/pin-2012-edu into chengdu