Merge branch 'master' into '55-add-an-informative-text-above-the-introductory-video'

# Conflicts:
#   src/app/components/home/_dialogs/demo-video/demo-video.component.html
#   src/app/components/home/_dialogs/demo-video/demo-video.component.scss
#   src/app/components/home/_dialogs/demo-video/demo-video.component.ts
5 jobs for 55-add-an-informative-text-above-the-introductory-video in 7 minutes and 55 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Codestyle
passed #165831
nodejs
tslint

00:01:39

 
  Test
passed #165832
nodejs
unit_tests

00:01:46

 
  Build
passed #165833
angular
ngbuild

00:04:27

 
  Review
passed #165834
nginx
review

00:00:01

passed #165835
nginx allowed to fail manual
stop_review

00:00:00