Added Fraunhofer Fokus Logo
resolving merge conflicts in contrib json.
Merge pull request #193 from AkamaiDASH/development

resolving merge conflicts in contrib json.