Merge branch 'develop' of gitlab.local:porsche/CI-2017 into develop

# Conflicts:
#	dist/css/ci.css
#	dist/css/ci.css.map
1 job for develop in 15 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #3476
build

00:00:15