Merge branch 'master' into lingjun
Merge branch 'master' into lingjun
Fix iScroll compatiable issues.
Merge branch 'lingjun'