Merge branch 'master' into '46-rewordings'

# Conflicts:
#   src/app/components/shared/login/login.component.html
#   src/assets/i18n/home/de.json
5 jobs for 46-rewordings in 8 minutes and 18 seconds (queued for 1 second)
Status Job ID Name Coverage
  Codestyle
passed #166495
nodejs
tslint

00:02:11

 
  Test
passed #166496
nodejs
unit_tests

00:01:48

 
  Build
passed #166497
angular
ngbuild

00:04:16

 
  Review
passed #166498
nginx
review

00:00:01

passed #166499
nginx allowed to fail manual
stop_review

00:00:00