modified:   myadmin/models.py
modified:   myadmin/views/school.py
Merge branch 'master' of https://github.com/linxiaocong/Medusa
modified:   myadmin/templates/myadmin/school/album_list.html
modified:   myadmin/urls.py
modified:   myadmin/views/school.py