flickr related changes
Merge branch 'master' of https://github.com/LFHao/ZyxtTask8