Merge branch 'lingjun'
Fixed a bug of news list after commenting iscroll.
Layout change
Merge branch 'master' into lingjun