hiking modify
Merge branch 'master' of https://github.com/xuhaiqing/MyPortal.git