merge conflict
Merge branch 'master' of https://github.com/hwjworld/xiaodun-platform

Conflicts:
	cms/templates/students_static.html
fix upload repeat file bug