Merge branch 'dev' into 'testing'

# Conflicts:
#   .gitlab-ci.yml
#   ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml
#   ckanext-theme_hft/ckanext/theme_hft/templates/base.html
#   ckanext-theme_hft/ckanext/theme_hft/templates/footer.html

ckanext-theme_hft/ckanext/theme_hft/assets/webassets.yml

 theme:
   filters: cssrewrite
-  output: assets/%(version)s_theme.css
+  output: katalog/assets/%(version)s_theme.css
   contents: theme.css

ckanext-theme_hft/ckanext/theme_hft/templates/base.html

@@ -3,5 +3,5 @@
 {% block styles %}
 	{{ super() }}
 	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous">
-	{% asset 'theme_hft/theme.css' %}
+	{% asset 'theme_hft/theme' %}
 {% endblock %}