Fix FIWARE branding
Merge remote-tracking branch 'origin/xifi' into develop