img's id of amazon.cn changed from original-main-image to main-image
Merge remote-tracking branch 'origin/nowaterfall' into nowaterfall

not pull first,just comment at local