Merge remote-tracking branch 'origin/Flickr-engine' into Flickr-engine - searx - My custom branche(s) on searx, a meta-search engine

commit: 17fd4ea4e72ad7ace3658446d149882e605bda43
parent 930f724ec639c167d870d716240ac5d4512beba2
Author: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date:   Tue, 16 Dec 2014 20:44:11 +0100

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

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