修改了一些服务
Merge remote-tracking branch 'origin/pinwall2.5' into pinwall2.5

Conflicts:
	js/src/angularSrc/animations.js