替换后台
Merge remote branch 'upstream/master' into dev

Conflicts:
	templates/shake/rank.html
Merge pull request #21 from hexiaoming/master

替换后台+前端修改接口