Fix bug 1013978 - update address for Berlin office
Bug 1011081 - Fix os/devices template for l10n
Merge pull request #2033 from TheoChevalier/devices-template-l10n-fix

Bug 1011081 - Fix os/devices template for l10n
Merge pull request #2030 from craigcook/bug-1013878-update-berlin-address

Fix bug 1013978 - update address for Berlin office