remove alert
Merge branch 'master' into yaofei
homepage fix