分页跟居中
Merge branch 'master' of https://github.com/funkyLover/yjjapp

Conflicts:
	lib/s.js
图标
Merge branch 'master' of https://github.com/node200ok/yjjapp
Merge pull request #10 from node200ok/master

merge from source