升级版本

增加进度提示
Merge branch 'master' of https://github.com/Aaronlong31/GetFlickrImageUrl

Conflicts:
	popup.html
	popup.js