修正
Merge remote-tracking branch 'origin/master'

Conflicts:
	dailyCom/src/main/webapp/WEB-INF/view/index.jsp