Updated elfari
Merge branch 'master' of github.com:ssedano/elfari

Conflicts:
	elfari.geojson