yanzheng

yanzheng
Merge branch 'master' of https://github.com/poppinyunhai/jiaoshipeixun

Conflicts:
db/development.sqlite3
Merge branch 'master' of https://github.com/poppinyunhai/jiaoshipeixun