Merge branch 'complex-singleton'

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