Merge branch 'master' of https://github.com/GeoDienstenCentrum/geodienstencentrum.github.io

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/GeoDienstenCentrum/geodienstencentrum.github.io
Merge branch 'master' of https://github.com/GeoDienstenCentrum/geodienstencentrum.github.io
Merge branch 'master' of https://github.com/GeoDienstenCentrum/geodienstencentrum.github.io
update bundle

[ci-skip]
Merge branch 'master' of https://github.com/GeoDienstenCentrum/geodienstencentrum.github.io

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/GeoDienstenCentrum/geodienstencentrum.github.io
update bundle + scss lint fixes