修改了一部分控制器
Merge remote-tracking branch 'origin/pinwall2.5' into pinwall2.5

Conflicts:
	index.html
	js/src/angularSrc/animations.js
	views/showBoxes.html