Merge branch 'master' into lingjun
Fixed a bug and remove some log.
Commented iscroll on new page temperarily.
Merge branch 'master' into lingjun
Merge branch 'lingjun'