Merge branch 'flickrwrappr2'
Merge RDF bugfixes from branch 'flickrwrappr2'
Merge *Lookup classes from commit '58a33510ccb' into multiple-lookup-service-providers