fixed a bug
Merge branch 'chengdu' of github.com:mindpin-shcmusic/pin-2012-edu into chengdu