修改上传，并调试了部分接口
Merge remote-tracking branch 'origin/pinwall2.5' into pinwall2.5

Conflicts:
	js/src/animations.js