Merge branch '1.1' of gitcafe.com:ben7th/pin-2012-edu into 1.1
教学方案等 migration
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1