修复接口
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/src/js/controllers/IndexController.js
给首页的滚动条绑定scroll事件