页码修改，及其他bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/kelidly/front/css/style.css