FEATURE: hide google search on 404 page for private instance
FIX: Some default group names could not be translated
Merge pull request #2767 from gschlager/i18n_fix04

FIX: Some default group names could not be translated
Merge pull request #2761 from techAPJ/patch-2

FEATURE: hide google search on 404 page for private instance
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into archetypes