Formatting
Merge branch 'complex-singleton' into multiple-lookup-service-providers

Conflicts:
	src/main/scala/org/dbpedia/media_extractor/flickr/FlickrWrappr2.scala