Merge remote-tracking branch 'origin/Flickr-engine' into Flickr-engine

Conflicts:
	searx/engines/flickr.py
	searx/settings.yml